From 9cc00de219965372f23708fa08d04347745668f9 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期三, 31 一月 2024 17:51:48 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipment.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipment.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipment.java
index 058f9bc..cc47df4 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipment.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipment.java
@@ -7,6 +7,7 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
import org.jeecg.common.system.base.entity.JeecgEntity;
import org.jeecgframework.poi.excel.annotation.Excel;
@@ -46,13 +47,13 @@
/**
* 鎶ヨ鍙�
*/
- @Excel(name = "鎶ヨ鍙�", width = 15)
+ //@Excel(name = "鎶ヨ鍙�", width = 15)
@ApiModelProperty(value = "鎶ヨ鍙�")
private String alarm;
/**
* 閲囬泦鏃堕棿
*/
- @Excel(name = "閲囬泦鏃堕棿", width = 15)
+ //@Excel(name = "閲囬泦鏃堕棿", width = 15)
@ApiModelProperty(value = "閲囬泦鏃堕棿")
private String collectTime;
/**
@@ -64,7 +65,7 @@
/**
* 璁惧瀹炴椂鐘舵��
*/
- @Excel(name = "璁惧瀹炴椂鐘舵��", width = 15)
+ //@Excel(name = "璁惧瀹炴椂鐘舵��", width = 15)
@ApiModelProperty(value = "璁惧瀹炴椂鐘舵��")
private Integer oporation;
/**
@@ -100,7 +101,7 @@
/**
* 閲囬泦鍙傛暟琛�
*/
- @Excel(name = "閲囬泦鍙傛暟琛�", width = 15)
+ @Excel(name = "閲囬泦鍙傛暟琛�", width = 30)
@ApiModelProperty(value = "閲囬泦鍙傛暟琛�")
private String saveTableName;
/**
@@ -125,14 +126,17 @@
/**
* 璁惧鐘舵��
*/
- @Excel(name = "璁惧鐘舵��", width = 15)
+ @Excel(name = "璁惧鐘舵��", width = 15, dicCode = "mdc_equipment_status")
+ @Dict(dicCode = "mdc_equipment_status")
@ApiModelProperty(value = "璁惧鐘舵��")
private Integer equipmentStatus;
/**閮ㄩ棬鍚嶇О*/
+ @Excel(name = "閮ㄩ棬鍚嶇О", width = 15)
private transient String orgCodeTxt;
/**浜х嚎鍚嶇О*/
+ @Excel(name = "杞﹂棿鍚嶇О", width = 15)
private transient String productionName;
@TableField(exist = false)
--
Gitblit v1.9.3