From 52a302b11c08cbc564ff3931038ae57a305a95d6 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期二, 23 一月 2024 09:23:52 +0800
Subject: [PATCH] 修改

---
 modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/model/ConfigItemWarehouse.java |   47 +++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/model/ConfigItemWarehouse.java b/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/model/ConfigItemWarehouse.java
index 9a6fd48..3c524d5 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/model/ConfigItemWarehouse.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/model/ConfigItemWarehouse.java
@@ -1,5 +1,6 @@
 package com.zt.life.modules.configItemWarehouse.model;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.zt.common.entity.BusiEntity;
@@ -28,12 +29,6 @@
 	@ApiModelProperty(value = "閰嶇疆椤瑰叆搴撶紪鍙�")
 	private String code;
 
-	@ApiModelProperty(value = "椤圭洰缂栧彿")
-	private String projectCode;
-
-	@ApiModelProperty(value = "椤圭洰鍚嶇О")
-	private String projectName;
-
 	@ApiModelProperty(value = "鐢宠浜�")
 	private String applicant;
 
@@ -44,11 +39,40 @@
 	@ApiModelProperty(value = "搴撶被鍨�")
 	private String libraryType;
 
+	@ApiModelProperty(value = "QA瀹℃牳缁撴灉")
+	private String qaAuditResults;
+
+	@ApiModelProperty(value = "QA瀹℃牳浜�")
+	private String qaAuditor;
+
+	@ApiModelProperty(value = "QA瀹℃牳浜篒D")
+	private Long qaAuditorId;
+
+	@ApiModelProperty(value = "QA瀹℃牳鏃ユ湡")
+	@JsonFormat(pattern = "yyyy-MM-dd")
+	private Date qaAuditDate;
+
+	@ApiModelProperty(value = "CM瀹℃牳缁撴灉")
+	private String cmAuditResults;
+
+	@ApiModelProperty(value = "CM瀹℃牳浜�")
+	private String cmAuditor;
+
+	@ApiModelProperty(value = "CM瀹℃牳浜篒D")
+	private Long cmAuditorId;
+
+	@ApiModelProperty(value = "CM瀹℃牳鏃ユ湡")
+	@JsonFormat(pattern = "yyyy-MM-dd")
+	private Date cmAuditDate;
+
 	@ApiModelProperty(value = "鎵瑰噯鎰忚")
 	private String approvalOpinions;
 
 	@ApiModelProperty(value = "鎵瑰噯绛惧瓧")
 	private String approvalSign;
+
+	@ApiModelProperty(value = "鎵瑰噯绛惧瓧")
+	private String approvalId;
 
 	@ApiModelProperty(value = "鎵瑰噯鏃ユ湡")
 	@JsonFormat(pattern = "yyyy-MM-dd")
@@ -60,6 +84,9 @@
 	@ApiModelProperty(value = "鎿嶄綔浜�")
 	private String operator;
 
+	@ApiModelProperty(value = "鎿嶄綔浜篒D")
+	private Long operatorId;
+
 	@ApiModelProperty(value = "鎿嶄綔鏃ユ湡")
 	@JsonFormat(pattern = "yyyy-MM-dd")
 	private Date operateDate;
@@ -70,4 +97,12 @@
 	@ApiModelProperty(value = "骞翠唤")
 	private String year;
 
+	@TableField(exist = false)
+	@ApiModelProperty(value = "椤圭洰鍚嶇О")
+	private String softwareName;
+
+	@TableField(exist = false)
+	@ApiModelProperty(value = "椤圭洰缂栧彿")
+	private String projectCode;
+
 }

--
Gitblit v1.9.1