Merge remote-tracking branch 'origin/master'

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDevice/entity/ItdmDevice.java

@@ -68,7 +68,7 @@ public class ItdmDevice implements Serializable {
 	/**设备状态*/
 	@Excel(name = "设备状态", width = 15, dicCode = "device_status")
 	@Dict(dicCode = "device_status")
-    @ApiModelProperty(value = "设备状态")
+    @ApiModelProperty(value = "设备状态（待机0,运行中1,报警2,故障3,非故障4)")
     private java.lang.Integer deviceStatus;
 	/**维护时间*/
     @TableField(value = "repair_time", updateStrategy = FieldStrategy.IGNORED)
@@ -106,7 +106,7 @@ public class ItdmDevice implements Serializable {
 	/**设备运行标识*/
 	@Excel(name = "设备运行标识", width = 15, dicCode = "biaoshi")
 	@Dict(dicCode = "biaoshi")
-    @ApiModelProperty(value = "设备运行标识")
+    @ApiModelProperty(value = "设备运行标识(0设备已结束运行1设备已开始运行)")
     private java.lang.Integer biaoshi;
 	/**是否已维护*/
 	@Excel(name = "是否已维护(0未维护1已维护)", width = 15, dicCode = "is_repair")

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmWenxiangHistory/entity/ItdmWenxiangHistory05.java

@@ -34,11 +34,11 @@ public class ItdmWenxiangHistory05 implements Serializable {
 
     /**温箱数据id*/
     @TableId(type = IdType.ASSIGN_ID)
-//    @ApiModelProperty(value = "温箱数据id")
+    @ApiModelProperty(value = "温箱数据id")
     private java.lang.Integer id;
     /**设备id*/
-    @Excel(name = "设备id", width = 15)
-//    @ApiModelProperty(value = "设备id")
+//    @Excel(name = "设备id", width = 15)
+    @ApiModelProperty(value = "设备id")
     private java.lang.String deviceId;
     /**设备名称*/
     @Excel(name = "设备名称", width = 15)

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmWenxiangHistory/entity/ItdmWenxiangHistory1.java

@@ -34,11 +34,11 @@ public class ItdmWenxiangHistory1 implements Serializable {
 
 	/**温箱数据id*/
 	@TableId(type = IdType.ASSIGN_ID)
-//    @ApiModelProperty(value = "温箱数据id")
+    @ApiModelProperty(value = "温箱数据id")
     private java.lang.Integer id;
 	/**设备id*/
-	@Excel(name = "设备id", width = 15)
-//    @ApiModelProperty(value = "设备id")
+//	@Excel(name = "设备id", width = 15)
+    @ApiModelProperty(value = "设备id")
     private java.lang.String deviceId;
 	/**设备名称*/
 	@Excel(name = "设备名称", width = 15)

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmWenxiangHistory/entity/ItdmWenxiangHistory16.java

@@ -34,11 +34,11 @@ public class ItdmWenxiangHistory16 implements Serializable {
 
     /**温箱数据id*/
     @TableId(type = IdType.ASSIGN_ID)
-//    @ApiModelProperty(value = "温箱数据id")
+    @ApiModelProperty(value = "温箱数据id")
     private java.lang.Integer id;
     /**设备id*/
-    @Excel(name = "设备id", width = 15)
-//    @ApiModelProperty(value = "设备id")
+//    @Excel(name = "设备id", width = 15)
+    @ApiModelProperty(value = "设备id")
     private java.lang.String deviceId;
     /**设备名称*/
     @Excel(name = "设备名称", width = 15)

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmWenxiangHistory/entity/ItdmWenxiangHistory48.java

@@ -34,11 +34,11 @@ public class ItdmWenxiangHistory48 implements Serializable {
 
     /**温箱数据id*/
     @TableId(type = IdType.ASSIGN_ID)
-//    @ApiModelProperty(value = "温箱数据id")
+    @ApiModelProperty(value = "温箱数据id")
     private java.lang.Integer id;
     /**设备id*/
-    @Excel(name = "设备id", width = 15)
-//    @ApiModelProperty(value = "设备id")
+//    @Excel(name = "设备id", width = 15)
+    @ApiModelProperty(value = "设备id")
     private java.lang.String deviceId;
     /**设备名称*/
     @Excel(name = "设备名称", width = 15)

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmWenxiangHistory/entity/ItdmWenxiangHistory8.java

@@ -34,11 +34,11 @@ public class ItdmWenxiangHistory8 implements Serializable {
 
     /**温箱数据id*/
     @TableId(type = IdType.ASSIGN_ID)
-//    @ApiModelProperty(value = "温箱数据id")
+    @ApiModelProperty(value = "温箱数据id")
     private java.lang.Integer id;
     /**设备id*/
-    @Excel(name = "设备id", width = 15)
-//    @ApiModelProperty(value = "设备id")
+//    @Excel(name = "设备id", width = 15)/
+    @ApiModelProperty(value = "设备id")
     private java.lang.String deviceId;
     /**设备名称*/
     @Excel(name = "设备名称", width = 15)

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmWenxiangHistory/entity/ItdmWenxiangHistoryMj.java

@@ -34,11 +34,11 @@ public class ItdmWenxiangHistoryMj implements Serializable {
 
     /**温箱数据id*/
     @TableId(type = IdType.ASSIGN_ID)
-//    @ApiModelProperty(value = "温箱数据id")
+    @ApiModelProperty(value = "温箱数据id")
     private java.lang.Integer id;
     /**设备id*/
-    @Excel(name = "设备id", width = 15)
-//    @ApiModelProperty(value = "设备id")
+//    @Excel(name = "设备id", width = 15)
+    @ApiModelProperty(value = "设备id")
     private java.lang.String deviceId;
     /**设备名称*/
     @Excel(name = "设备名称", width = 15)

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmWenxiangHistory/entity/ItdmWenxiangHistorySzh.java

@@ -34,11 +34,11 @@ public class ItdmWenxiangHistorySzh implements Serializable {
 
     /**温箱数据id*/
     @TableId(type = IdType.ASSIGN_ID)
-//    @ApiModelProperty(value = "温箱数据id")
+    @ApiModelProperty(value = "温箱数据id")
     private java.lang.Integer id;
     /**设备id*/
-    @Excel(name = "设备id", width = 15)
-//    @ApiModelProperty(value = "设备id")
+//    @Excel(name = "设备id", width = 15)
+    @ApiModelProperty(value = "设备id")
     private java.lang.String deviceId;
     /**设备名称*/
     @Excel(name = "设备名称", width = 15)