From ea5e88b0c6f5be4d0c6637b5e7bba94ee85f9673 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 26 五月 2023 08:58:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs6' into bfasrs6
---
src/main/java/com/zy/asrs/entity/Mat.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/Mat.java b/src/main/java/com/zy/asrs/entity/Mat.java
index 5249268..8716473 100644
--- a/src/main/java/com/zy/asrs/entity/Mat.java
+++ b/src/main/java/com/zy/asrs/entity/Mat.java
@@ -338,7 +338,7 @@
private Boolean inoutEveryday;
/**
- * 鐗╂枡绫诲瀷{1:鍗曞搧,2:楂橀,3:娣锋斁}
+ * 鐗╂枡绫诲瀷{1:鍗曞搧鍖�,2:楂橀娣锋斁鍖�,3:浣庨娣锋斁鍖簘
*/
@ApiModelProperty(value= "鐗╂枡绫诲瀷")
@TableField("mat_type")
@@ -571,11 +571,11 @@
}
switch (this.matType) {
case 1:
- return "鍗曞搧";
+ return "鍗曞搧鍖�";
case 2:
- return "楂橀娣锋斁";
+ return "楂橀娣锋斁鍖�";
case 3:
- return "浣庨娣锋斁";
+ return "浣庨娣锋斁鍖�";
default:
return "";
}
--
Gitblit v1.9.1