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

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

@@ -48,7 +48,7 @@ public class MovementSectionReportDTO {
     private String projectName;
 
     @ApiModelProperty("个数->一级")
-    private BigDecimal numberOne;
+    private String numberOne;
 
     @ApiModelProperty("个数->二级")
     private String numberTwo;

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

@@ -64,7 +64,7 @@ public class MovementSectionReport implements Serializable {
 
     @ApiModelProperty("个数->一级")
     @TableField("number_one")
-    private BigDecimal numberOne;
+    private String numberOne;
 
     @ApiModelProperty("个数->二级")
     @TableField("number_two")

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

@@ -48,7 +48,7 @@ public class MovementSectionReportVO {
     private String projectName;
 
     @ApiModelProperty("个数->一级")
-    private BigDecimal numberOne;
+    private String numberOne;
 
     @ApiModelProperty("个数->二级")
     private String numberTwo;