From 1a2258c4eca2e7514b6096004fa1c3e0036b402b Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 14:04:24 +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/MdcEquipmentOvertime.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipmentOvertime.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipmentOvertime.java
index e4dea3c..a1284a4 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipmentOvertime.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipmentOvertime.java
@@ -31,17 +31,19 @@
private static final long serialVersionUID = -7163039765166584824L;
@Excel(name = "璁惧缂栧彿", width = 20)
- @ApiModelProperty("鏃ユ湡")
+ @ApiModelProperty("璁惧缂栧彿")
private String equipmentId;
@TableField(exist = false)
@Excel(name = "璁惧鍚嶇О", width = 20)
+ @ApiModelProperty("璁惧鍚嶇О")
private String equipmentName;
@ApiModelProperty("鏃ユ湡")
+ @Excel(name = "鏃ユ湡", width = 20)
private String theDate;
- @Excel(name = "鑷姩璁＄畻鏍囪瘑", width = 15)
+// @Excel(name = "鑷姩璁＄畻鏍囪瘑", width = 15)
@ApiModelProperty("鑷姩璁＄畻鏍囪瘑")
private Integer autoFlag = CommonConstant.AUTO_FLAG_N;
--
Gitblit v1.9.3