设备管理导入（设备名称唯一）

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

@@ -66,7 +66,7 @@ public class ItdmDevice implements Serializable {
     @ApiModelProperty(value = "设备编号")
     private java.lang.String deviceNo;
 	/**设备状态*/
-	@Excel(name = "设备状态", width = 15, dicCode = "device_status")
+	@Excel(name = "设备状态(待机,运行中,报警,故障,非故障)", width = 15, dicCode = "device_status")
 	@Dict(dicCode = "device_status")
     @ApiModelProperty(value = "设备状态（待机0,运行中1,报警2,故障3,非故障4)")
     private java.lang.Integer deviceStatus;
@@ -104,25 +104,25 @@ public class ItdmDevice implements Serializable {
     @ApiModelProperty(value = "本次运行开始时间")
     private java.util.Date runStartTime;
 	/**设备运行标识*/
-	@Excel(name = "设备运行标识", width = 15, dicCode = "biaoshi")
+	@Excel(name = "设备运行状态（设备已结束运行,设备已开始运行）", width = 15, dicCode = "biaoshi")
 	@Dict(dicCode = "biaoshi")
     @ApiModelProperty(value = "设备运行标识(0设备已结束运行1设备已开始运行)")
     private java.lang.Integer biaoshi;
 	/**是否已维护*/
-	@Excel(name = "是否已维护(0未维护1已维护)", width = 15, dicCode = "is_repair")
+	@Excel(name = "是否已维护(未维护,已维护)", width = 15, dicCode = "is_repair")
 	@Dict(dicCode = "is_repair")
     @ApiModelProperty(value = "是否已维护(0未维护1已维护)")
     private java.lang.Integer isRepair;
 	/**设备树id*/
-	@Excel(name = "设备树id", width = 15)
+//	@Excel(name = "设备树id", width = 15)
     @ApiModelProperty(value = "设备树id")
     private java.lang.Integer equipmenttreeid;
 	/**安装地点*/
-	@Excel(name = "安装地点", width = 15)
+//	@Excel(name = "安装地点", width = 15)
     @ApiModelProperty(value = "安装地点")
     private java.lang.String address;
 	/**区域*/
-	@Excel(name = "区域", width = 15)
+//	@Excel(name = "区域", width = 15)
     @ApiModelProperty(value = "区域")
     private java.lang.Integer specid;
 	/**备注*/
@@ -134,16 +134,16 @@ public class ItdmDevice implements Serializable {
     @ApiModelProperty(value = "单价")
     private java.lang.Integer danjia;
     /**是否能删除（0不可删除1可删除）*/
-    @Excel(name = "是否能删除", width = 15)
+//    @Excel(name = "是否能删除", width = 15)
     @ApiModelProperty(value = "是否能删除")
     private java.lang.Integer izDelete;
     /**重要性标准*/
-    @Excel(name = "重要性标准", width = 15, dicCode = "shiyan_shebe_type")
+    @Excel(name = "重要性标准（气候试验，力学试验，重要试验）", width = 15, dicCode = "shiyan_shebe_type")
     @Dict(dicCode = "shiyan_shebe_type")
     @ApiModelProperty(value = "重要性标准")
     private java.lang.Integer zyxbz;
     /**是否在大屏展示（0不展示1展示）*/
-    @Excel(name = "是否在大屏展示", width = 15)
+//    @Excel(name = "是否在大屏展示", width = 15)
     @ApiModelProperty(value = "是否在大屏展示")
     private java.lang.Integer izDisplay;