From f84d9e69907cb678150eaa6393fd74cf042fcca4 Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期四, 28 九月 2023 14:39:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into develop
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcDeviceCalendar.java | 10 ++--------
1 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcDeviceCalendar.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcDeviceCalendar.java
index a158b6f..dbb45dd 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcDeviceCalendar.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcDeviceCalendar.java
@@ -42,7 +42,7 @@
*/
@Excel(name = "璁惧缂栧彿", width = 15)
@ApiModelProperty(value = "璁惧缂栧彿")
- private String equmentId;
+ private String equipmentId;
/**
* 鐝ID
@@ -50,11 +50,5 @@
@Excel(name = "鐝ID", width = 15)
@ApiModelProperty(value = "鐝ID")
private String shiftSubId;
- /**
- * 鏄熸湡鏍囪瘑
- */
- @Excel(name = "鏄熸湡鏍囪瘑", width = 15)
- @ApiModelProperty(value = "鏄熸湡鏍囪瘑")
- @Dict(dicCode = "week_number_type")
- private String weekNumber;
+
}
--
Gitblit v1.9.3