From 0b08d373869c91dda58dd0e33b13fe59688234f9 Mon Sep 17 00:00:00 2001 From: zzw <wander.zheng@qq.com> Date: 星期三, 29 十一月 2023 17:03:54 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/model/ConfigItemWarehouse.java | 35 +++++++++++++++++++++++++++++------ 1 files changed, 29 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..1e24a90 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; @@ -43,6 +38,26 @@ @ApiModelProperty(value = "搴撶被鍨�") private String libraryType; + + @ApiModelProperty(value = "QA瀹℃牳缁撴灉") + private String qaAuditResults; + + @ApiModelProperty(value = "QA瀹℃牳浜�") + private String qaAuditor; + + @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瀹℃牳鏃ユ湡") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date cmAuditDate; @ApiModelProperty(value = "鎵瑰噯鎰忚") private String approvalOpinions; @@ -70,4 +85,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