Merge remote-tracking branch 'origin/master'

signal-control-service/pom.xml

@@ -49,6 +49,10 @@
                     <artifactId>springfox-spring-web</artifactId>
                     <groupId>io.springfox</groupId>
                 </exclusion>
+                <exclusion>
+                    <artifactId>swagger-annotations</artifactId>
+                    <groupId>io.swagger</groupId>
+                </exclusion>
             </exclusions>
         </dependency>
         <!-- 鉴权包 end -->

signal-control-service/src/main/java/net/wanji/web/service/scheme/impl/RunningPlanServiceImpl.java

@@ -256,9 +256,6 @@ public class RunningPlanServiceImpl implements RunningPlanService {
         String[] startEndTime = time.getStartEndTime();
         String startTime = startEndTime[0];
         String endTime = startEndTime[1];
-        if ("23:59".equals(endTime)) {
-            endTime = "24:00";
-        }
         String s = startTime + endTime;
         String sectionNo = s.replaceAll(":", "");
         crossSectionPO.setSectionNo(sectionNo);