Merge remote-tracking branch 'origin/develop' into develop

zc-business/src/main/java/com/zc/business/domain/DcEventTrafficControl.java

@@ -77,7 +77,7 @@ public class DcEventTrafficControl extends BaseEntity
 
     @ApiModelProperty("措施  1-临时关闭2-限行车辆3-限行车道4-限行车道且限行车辆5-间隔放行6-并道行驶 7-限速',")
     private Long measure; //措施
-    @ApiModelProperty("分类 1-主线关闭2-主线限行3-主线间隔放行4-主线并道5-主线限速',")
+    @ApiModelProperty("分类 1-主线关闭 2-主线限行3-主线间隔放行 4-主线并道 5-主线限速6-收费站关闭7-收费站限行8-收费站分流9-收费站间隔放行10-立交匝道关闭11-立交限行12-立交匝道限行13-立交分流14-服务区关闭,")
     private Long classify; //分类
     @ApiModelProperty("限制类型    1-只允许2-禁止',")
     private Long limitedType ;//限制类型

zc-business/src/main/java/com/zc/business/domain/DcEventVehicleAccident.java

@@ -78,8 +78,10 @@ public class DcEventVehicleAccident extends BaseEntity
             3-行3
             4-行4
              */
+/*
     @ApiModelProperty("车道占用：0-应急,1-行1 ,2-行2,3-行3,4-行4")
     private Long laneOccupancy;
+*/
 
     /** 小型车(辆) */
     @ApiModelProperty("小型车(辆)")