From 8f0d649d83de955cfcbf38ebdbfc90a70c6ac547 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 11 十月 2023 10:24:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs6' into bfasrs6
---
src/main/java/com/zy/asrs/entity/Mat.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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..b37f282 100644
--- a/src/main/java/com/zy/asrs/entity/Mat.java
+++ b/src/main/java/com/zy/asrs/entity/Mat.java
@@ -338,9 +338,9 @@
private Boolean inoutEveryday;
/**
- * 鐗╂枡绫诲瀷{1:鍗曞搧,2:楂橀,3:娣锋斁}
+ * 涓婃灦鍖哄煙{1:鍗曞搧鍖�,2:楂橀娣锋斁鍖�,3:浣庨娣锋斁鍖簘
*/
- @ApiModelProperty(value= "鐗╂枡绫诲瀷")
+ @ApiModelProperty(value= "涓婃灦鍖哄煙")
@TableField("mat_type")
private Integer matType;
@@ -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