From ce06cb3e8167151290d68b76b3684ec49e8f31a4 Mon Sep 17 00:00:00 2001
From: zzw <wander.zheng@qq.com>
Date: 星期五, 17 十一月 2023 17:04:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 modules/mainPart/src/main/java/com/zt/life/modules/project/model/Project.java |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/model/Project.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/model/Project.java
index ca54ea8..1fcbcf6 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/model/Project.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/model/Project.java
@@ -46,13 +46,13 @@
 	private String developUnitContWay;
 
 	@ApiModelProperty(value = "杞欢鍚嶇О")
-	private String software;
+	private String softwareName;
 
 	@ApiModelProperty(value = "椤圭洰缂栧彿")
 	private String code;
 
-	@ApiModelProperty(value = "椤圭洰鏍囪瘑")
-	private String identity;
+	@ApiModelProperty(value = "杞欢鏍囪瘑")
+	private String softwareIdentity;
 
 	@ApiModelProperty(value = "瀵嗙骇")
 	private Integer secretClass;
@@ -60,8 +60,8 @@
 	@ApiModelProperty(value = "鍏抽敭绛夌骇")
 	private Integer criticalLevel;
 
-	@ApiModelProperty(value = "娴嬭瘯绾у埆")
-	private Integer testLevel;
+	@ApiModelProperty(value = "杞欢绫诲瀷")
+	private String softwareType;
 
 	@ApiModelProperty(value = "椤圭洰璐熻矗浜�")
 	private String projectLeader;

--
Gitblit v1.9.1