From c688ad2d55d6a5355e0e75402177f3e7989600bc Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期三, 08 一月 2025 16:10:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdasrsVersion' into mdqdasrsVersion
---
src/main/java/com/zy/asrs/entity/Pakout.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/Pakout.java b/src/main/java/com/zy/asrs/entity/Pakout.java
index 5ad3c81..9c9d3b8 100644
--- a/src/main/java/com/zy/asrs/entity/Pakout.java
+++ b/src/main/java/com/zy/asrs/entity/Pakout.java
@@ -264,14 +264,19 @@
if (null == this.status){ return null; }
switch (this.status){
case 1:
- return "姝ｅ父";
+ return "宸插嚭搴�";
case 0:
- return "绂佺敤";
+ return "鏈嚭搴�";
+ case 8:
+ return "鏈畬鍏ㄥ嚭搴�";
+ case 9:
+ return "鍏ㄩ儴瀹屾垚鍑哄簱";
default:
return String.valueOf(this.status);
}
}
+
public String getCreateBy$(){
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.createBy);
--
Gitblit v1.9.1