From e331906c3191f012deb28ee18384a7087d987687 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期三, 22 十一月 2023 19:16:57 +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/MdcOverallEquipmentEfficiency.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcOverallEquipmentEfficiency.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcOverallEquipmentEfficiency.java
index 3f82318..0736092 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcOverallEquipmentEfficiency.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcOverallEquipmentEfficiency.java
@@ -50,10 +50,10 @@
     @ApiModelProperty(value = "鏈夋晥鏃ユ湡")
     private String validDate;
     /**
-     * 鐝id
+     * 鐝
      */
-    @ApiModelProperty(value = "鐝id")
-    private String shiftSubId;
+    @ApiModelProperty(value = "鐝")
+    private String shift;
     /**
      * 姣忕彮灏忔椂
      */

--
Gitblit v1.9.3