Merge branch 'dev-szl' into 'dev'

导入 TQI公里总结报告表 TQI总结报告表 超限记录报告 -shizhilong

See merge request !40

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

@@ -45,7 +45,7 @@ public class MovementOverReportDTO {
     private String movementMasterId;
 
     @ApiModelProperty("序号")
-    private String code;
+    private String xuhao;
 
     @ApiModelProperty("里程(m)")
     private BigDecimal mileage;
@@ -69,7 +69,7 @@ public class MovementOverReportDTO {
     private String dataDifference;
 
     @ApiModelProperty("线性")
-    private String linear;
+    private String xianxing;
 
     @ApiModelProperty("检测标准")
     private String standard;

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

@@ -59,8 +59,8 @@ public class MovementOverReport implements Serializable {
     private String movementMasterId;
 
     @ApiModelProperty("序号")
-    @TableField("code")
-    private String code;
+    @TableField("xuhao")
+    private String xuhao;
 
     @ApiModelProperty("里程(m)")
     @TableField("mileage")
@@ -91,8 +91,8 @@ public class MovementOverReport implements Serializable {
     private String dataDifference;
 
     @ApiModelProperty("线性")
-    @TableField("linear")
-    private String linear;
+    @TableField("xianxing")
+    private String xianxing;
 
     @ApiModelProperty("检测标准")
     @TableField("standard")

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

@@ -45,7 +45,7 @@ public class MovementOverReportVO {
     private String movementMasterId;
 
     @ApiModelProperty("序号")
-    private String code;
+    private String xuhao;
 
     @ApiModelProperty("里程(m)")
     private BigDecimal mileage;
@@ -69,7 +69,7 @@ public class MovementOverReportVO {
     private String dataDifference;
 
     @ApiModelProperty("线性")
-    private String linear;
+    private String xianxing;
 
     @ApiModelProperty("检测标准")
     private String standard;