From c354b62e324e63691418974d5f88b916e8a35f0a Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期一, 07 七月 2025 15:37:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamMaintenanceStandardRequest.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamMaintenanceStandardRequest.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamMaintenanceStandardRequest.java
index d12e2ff..544d7de 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamMaintenanceStandardRequest.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamMaintenanceStandardRequest.java
@@ -7,6 +7,7 @@
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecg.common.api.vo.FileUploadResult;
+import org.jeecg.common.aspect.annotation.Dict;
import org.jeecg.modules.eam.entity.EamMaintenanceStandardDetail;
import org.springframework.format.annotation.DateTimeFormat;
@@ -48,16 +49,16 @@
private String standardStatus;
/**鏍囧噯鐗堟湰*/
@ApiModelProperty(value = "鏍囧噯鐗堟湰")
- private Integer standardVersion;
+ private String standardVersion;
/**鏂囦欢缂栧彿*/
@ApiModelProperty(value = "鏂囦欢缂栧彿")
private String fileCode;
- /**鍙傝�冩枃浠�*/
- @ApiModelProperty(value = "鍙傝�冩枃浠�")
- private String referenceFile;
- /**涓婁紶鏂囦欢瀵圭郴*/
- @ApiModelProperty(value = "涓婁紶鏂囦欢瀵硅薄")
- private List<FileUploadResult> fileList;
+ /**
+ * 淇濆吇鍛ㄦ湡鍗曚綅
+ */
+ @ApiModelProperty(value = "淇濆吇鍛ㄦ湡鍗曚綅")
+ @Dict(dicCode = "period_unit")
+ private String periodUnit;
/**鍒楄〃 淇濆吇椤规槑缁�*/
@ApiModelProperty(value = "鍒楄〃 淇濆吇椤规槑缁�")
private List<EamMaintenanceStandardDetail> tableDetailList;
--
Gitblit v1.9.3