From 497ee5e5905f1808717ffec2ee2889262d2ba90c Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期四, 07 十二月 2023 17:15:35 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/configItemChange/controller/ConfigItemChangeController.java | 2 +-
modules/mainPart/src/main/java/com/zt/life/modules/configItemChange/model/ConfigItemChange.java | 47 +++++++++++++++++++++++++++++++++++++----------
2 files changed, 38 insertions(+), 11 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/configItemChange/controller/ConfigItemChangeController.java b/modules/mainPart/src/main/java/com/zt/life/modules/configItemChange/controller/ConfigItemChangeController.java
index d369d41..8f02d55 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/configItemChange/controller/ConfigItemChangeController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/configItemChange/controller/ConfigItemChangeController.java
@@ -107,7 +107,7 @@
return Result.ok();
}
- @DeleteMapping("deleteConfigItem")
+ @DeleteMapping("deleteConfigChange")
@ApiOperation("鍒犻櫎")
@LogOperation("鍒犻櫎")
public Result delete(@RequestBody Long[] ids){
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/configItemChange/model/ConfigItemChange.java b/modules/mainPart/src/main/java/com/zt/life/modules/configItemChange/model/ConfigItemChange.java
index 861ec62..3284af2 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/configItemChange/model/ConfigItemChange.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/configItemChange/model/ConfigItemChange.java
@@ -25,8 +25,6 @@
@ApiModelProperty(value = "椤圭洰ID")
private Long projectId;
-
-
@ApiModelProperty(value = "閰嶇疆椤瑰叆搴撶紪鍙�")
private String code;
@@ -39,6 +37,22 @@
@ApiModelProperty(value = "搴撶被鍨�")
private String libraryType;
+
+ @ApiModelProperty(value = "鍙樻洿鍘熷洜")
+ private String changeReason;
+
+ @ApiModelProperty(value = "鍙樻洿褰卞搷鍒嗘瀽")
+ private String changeAnalysis;
+
+ @ApiModelProperty(value = "鍙樻洿鍐呭")
+ private String changeContent;
+
+ @ApiModelProperty(value = "鍙樻洿瀹炴柦浜�")
+ private String implementer;
+
+ @ApiModelProperty(value = "鍙樻洿鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date changeDate;
@ApiModelProperty(value = "QA瀹℃牳缁撴灉")
private String qaAuditResults;
@@ -76,18 +90,31 @@
@JsonFormat(pattern = "yyyy-MM-dd")
private Date approvalDate;
- @ApiModelProperty(value = "椤圭洰CM鎿嶄綔")
- private String projectCmOperations;
+ @ApiModelProperty(value = "鍑哄簱CM鎿嶄綔")
+ private String outboundCmOperations;
- @ApiModelProperty(value = "鎿嶄綔浜�")
- private String operator;
+ @ApiModelProperty(value = "鍑哄簱鎿嶄綔浜�")
+ private String outboundOperator;
- @ApiModelProperty(value = "鎿嶄綔浜篒D")
- private String operatorId;
+ @ApiModelProperty(value = "鍑哄簱鎿嶄綔浜篒D")
+ private String outboundOperatorId;
- @ApiModelProperty(value = "鎿嶄綔鏃ユ湡")
+ @ApiModelProperty(value = "鍑哄簱鎿嶄綔鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd")
- private Date operateDate;
+ private Date outboundOperateDate;
+
+ @ApiModelProperty(value = "鍏ュ簱CM鎿嶄綔")
+ private String warehouseCmOperations;
+
+ @ApiModelProperty(value = "鍏ュ簱鎿嶄綔浜�")
+ private String warehouseOperator;
+
+ @ApiModelProperty(value = "鍏ュ簱鎿嶄綔浜篒D")
+ private String warehouseOperatorId;
+
+ @ApiModelProperty(value = "鍏ュ簱鎿嶄綔鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date warehouseOperateDate;
@ApiModelProperty(value = "澶囨敞")
private String remark;
--
Gitblit v1.9.1