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-eam/src/main/java/org/jeecg/modules/eam/entity/DailyInspectionStandard.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DailyInspectionStandard.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DailyInspectionStandard.java
index e818774..8807fe2 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DailyInspectionStandard.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DailyInspectionStandard.java
@@ -63,16 +63,16 @@
@ApiModelProperty(value = "澶囨敞")
private String remark;
/**澶囩敤瀛楁1*/
- @Excel(name = "澶囩敤瀛楁1", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁1")
+ @Excel(name = "绠＄悊鍒跺害鍙�", width = 15)
+ @ApiModelProperty(value = "绠＄悊鍒跺害鍙�")
private String disUda1;
/**澶囩敤瀛楁2*/
- @Excel(name = "澶囩敤瀛楁2", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁2")
+ @Excel(name = "瀹℃牳缁撴灉", width = 15)
+ @ApiModelProperty(value = "瀹℃牳缁撴灉")
private String disUda2;
/**澶囩敤瀛楁3*/
- @Excel(name = "澶囩敤瀛楁3", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁3")
+ @Excel(name = "瀹℃壒缁撴灉", width = 15)
+ @ApiModelProperty(value = "瀹℃壒缁撴灉")
private String disUda3;
/**澶囩敤瀛楁4*/
@Excel(name = "澶囩敤瀛楁4", width = 15)
@@ -129,4 +129,7 @@
@TableField(exist = false)
private List<DailyInspectionStandardDetail> dailyInspectionStandardDetaillist;
+ @TableField(exist = false)
+ private List<DailyInspectionStandard> dailyInspectionStandardlist;
+
}
--
Gitblit v1.9.3