海南bug修改提交

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/dto/SensitiveReportExcel.java

@@ -54,7 +54,7 @@ public class SensitiveReportExcel implements Serializable {
 //    private String orgId;
 
 
-    @Excel(name = "工程预期投产日期(yyyy-MM-dd)", width = 30)
+    @Excel(name = "*工程预期投产日期(yyyy-MM-dd)", width = 30)
     private String expectedProductionDate;
 
     @Excel(name = "电压等级", width = 30)

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/dto/SensitiveUserSExcel.java

@@ -57,7 +57,7 @@ public class SensitiveUserSExcel implements Serializable {
 //    private String orgId;
 
 
-    @Excel(name = "工程预期投产日期(yyyy-MM-dd)", width = 30)
+    @Excel(name = "*工程预期投产日期(yyyy-MM-dd)", width = 30)
     @NotBlank(message = "工程预期投产日期不能为空")
     private String expectedProductionDate;
 

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/dto/SupervisionDevMainReportExcel.java

@@ -209,14 +209,14 @@ public class SupervisionDevMainReportExcel {
     private String timeSyncFunction = "0";
 
     /**
-     * 电镀功能
+     * 电度功能
      */
     @Excel(name = "电度功能", width = 30, replace = {"关闭_0", "开启_1"})
     private String electroplatingFunction = "0";
 
 
     /**
-     * 召换标志
+     * 召唤标志
      */
     @Excel(name = "召唤标志", width = 30, replace = {"周期触发_0", "变位触发_1"})
     private String summonFlag = "0";

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionTempDeviceReportParam.java

@@ -206,9 +206,9 @@ public class SupervisionTempDeviceReportParam {
     private Integer timeSyncFunction;
 
     /**
-     * 电镀功能
+     * 电度功能
      */
-    @ApiModelProperty(value="电镀功能")
+    @ApiModelProperty(value="电度功能")
     private Integer electroplatingFunction;
 
     /**
@@ -218,9 +218,9 @@ public class SupervisionTempDeviceReportParam {
     private String monitoringDeviceInstallationPosition;
 
     /**
-     * 召换标志
+     * 召唤标志
      */
-    @ApiModelProperty(value="召换标志")
+    @ApiModelProperty(value="召唤标志")
     private String summonFlag;
 
     /**

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/SupervisionTempDeviceReport.java

@@ -204,7 +204,7 @@ public class SupervisionTempDeviceReport {
     private Integer timeSyncFunction;
 
     /**
-     * 电镀功能
+     * 电度功能
      */
     @TableField(value = "electroplating_function")
     private Integer electroplatingFunction;
@@ -216,7 +216,7 @@ public class SupervisionTempDeviceReport {
     private String monitoringDeviceInstallationPosition;
 
     /**
-     * 召换标志
+     * 召唤标志
      */
     @TableField(value = "summon_flag")
     private String summonFlag;