Merge remote-tracking branch 'origin/dev-szl' into dev-hkl

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/dto/MovementCourseInfoDTO.java

@@ -39,7 +39,7 @@ public class MovementCourseInfoDTO {
     private String movementMasterId;
 
     @ApiModelProperty("动静态几何尺寸对应得里程信息主键-》外键")
-    private BigDecimal movementCourseId;
+    private String movementCourseId;
 
     @ApiModelProperty("轨号")
     private String trackCode;

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/entity/MovementCourseInfo.java

@@ -60,7 +60,7 @@ public class MovementCourseInfo implements Serializable {
 
     @ApiModelProperty("动静态几何尺寸对应得里程信息主键-》外键")
     @TableField("movement_course_id")
-    private BigDecimal movementCourseId;
+    private String movementCourseId;
 
     @ApiModelProperty("轨号")
     @TableField("track_code")

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/vo/MovementCourseInfoVO.java

@@ -45,7 +45,7 @@ public class MovementCourseInfoVO {
     private String movementMasterId;
 
     @ApiModelProperty("动静态几何尺寸对应得里程信息主键-》外键")
-    private BigDecimal movementCourseId;
+    private String movementCourseId;
 
     @ApiModelProperty("轨号")
     private String trackCode;