Merge remote-tracking branch 'origin/dev' into cbs

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/positionmap/vo/PositionMapLineRespVO.java

@@ -126,6 +126,9 @@ public class PositionMapLineRespVO {
     @ExcelProperty("反向限速(m/s)")
     private BigDecimal reverseSpeedLimit;
 
+    @Schema(description = "是否开启防撞 0否 1是", example = "15890")
+    private Integer collisionAvoidanceFlag;
+
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/positionmap/vo/PositionMapLineSaveReqVO.java

@@ -112,6 +112,9 @@ public class PositionMapLineSaveReqVO {
     private BigDecimal reverseSpeedLimit;
 
 
+    @Schema(description = "是否开启防撞 0否 1是", example = "15890")
+    private Integer collisionAvoidanceFlag;
+
     @Schema(description = "车头朝向(0:正正 1:正反 2:反正 3:反反 4正随 5随正 6随反 7反随 8随随 如果是单向的话 0代表正 1代表反 2代表随意", example = "15890")
     private Integer toward;
 

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/positionmap/PositionMapLineDO.java

@@ -168,6 +168,10 @@ public class PositionMapLineDO extends BaseDO {
      */
     private BigDecimal reverseSpeedLimit;
 
+    /**
+     * 是否开启防撞 0否 1是
+     */
+    private Integer collisionAvoidanceFlag;
     /**
      * 车头朝向(0:正正 1:正反 2:反正 3:反反 4正随 5随正 6随反 7反随 8随随 如果是单向的话 0代表正 1代表反 2代表随意
      */