From d3f11759e6b32d7e9e63e0f7b0cc4b6874aea020 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 28 八月 2023 11:14:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs6' into bfasrs6
---
src/main/java/com/zy/asrs/entity/Mat.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/Mat.java b/src/main/java/com/zy/asrs/entity/Mat.java
index 04b9923..b37f282 100644
--- a/src/main/java/com/zy/asrs/entity/Mat.java
+++ b/src/main/java/com/zy/asrs/entity/Mat.java
@@ -338,11 +338,11 @@
private Boolean inoutEveryday;
/**
- * 鐗╂枡绫诲瀷{1:鍗曞搧,2:楂橀,3:娣锋斁}
+ * 涓婃灦鍖哄煙{1:鍗曞搧鍖�,2:楂橀娣锋斁鍖�,3:浣庨娣锋斁鍖簘
*/
- @ApiModelProperty(value= "鐗╂枡绫诲瀷")
- @TableField("man_type")
- private Integer manType;
+ @ApiModelProperty(value= "涓婃灦鍖哄煙")
+ @TableField("mat_type")
+ private Integer matType;
public Mat() {}
@@ -565,17 +565,17 @@
}
}
- public String getManType$() {
- if (this.manType == null) {
+ public String getMatType$() {
+ if (this.matType == null) {
return "";
}
- switch (this.manType) {
+ switch (this.matType) {
case 1:
- return "鍗曞搧";
+ return "鍗曞搧鍖�";
case 2:
- return "楂橀";
+ return "楂橀娣锋斁鍖�";
case 3:
- return "娣锋斁";
+ return "浣庨娣锋斁鍖�";
default:
return "";
}
--
Gitblit v1.9.1