From 27f0c5253fb48dbf9635d31c62d3435407f326c1 Mon Sep 17 00:00:00 2001
From: LSH <brook_w@163.com>
Date: 星期三, 17 八月 2022 17:48:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/gzynasrs' into gzynasrs
---
src/main/java/com/zy/asrs/entity/TestMast.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/TestMast.java b/src/main/java/com/zy/asrs/entity/TestMast.java
index 42ff18f..6f6cfde 100644
--- a/src/main/java/com/zy/asrs/entity/TestMast.java
+++ b/src/main/java/com/zy/asrs/entity/TestMast.java
@@ -47,12 +47,13 @@
* 鐢ㄦ埛鐮�
*/
@ApiModelProperty(value= "鐢ㄦ埛鐮�")
+ @TableField("user_id")
private String userId;
/**
* 鐘舵�� 0: 寰呯敵璇� 1: 鐢宠涓� 2: 宸插鏍�;3 4: 瀹屾垚
*/
- @ApiModelProperty(value= "鐘舵�� 0: 寰呯敵璇� 1: 鐢宠涓� 2: 宸插鏍�;3 4: 瀹屾垚 ")
+ @ApiModelProperty(value= "鐘舵�� 0: 寰呯敵璇� 1: 鐢宠涓� 2: 宸插鏍� 3锛氭祴璇曚腑 4: 瀹屾垚 ")
private Integer status;
/**
@@ -102,7 +103,9 @@
case 1:
return "鐢宠涓�";
case 2:
- return "宸插鏍�;3";
+ return "宸插鏍�";
+ case 3:
+ return "娴嬭瘯涓�";
case 4:
return "瀹屾垚";
default:
--
Gitblit v1.9.1