From db05e7296bcef514ae3f204971ebbdd502019041 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期五, 10 五月 2024 13:30:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
user-server/src/main/java/com/yuanchu/mom/pojo/User.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/user-server/src/main/java/com/yuanchu/mom/pojo/User.java b/user-server/src/main/java/com/yuanchu/mom/pojo/User.java
index 1a555c1..fa96e20 100644
--- a/user-server/src/main/java/com/yuanchu/mom/pojo/User.java
+++ b/user-server/src/main/java/com/yuanchu/mom/pojo/User.java
@@ -32,9 +32,13 @@
private String password;
@ValueTableShow(2)
- @ApiModelProperty(value = "鐢ㄦ埛鍚�")
+ @ApiModelProperty(value = "濮撳悕")
private String name;
+// @ValueTableShow(2)
+// @ApiModelProperty(value = "濮撳悕EN")
+// private String nameEn;
+
@ValueTableShow(3)
@ApiModelProperty(value = "鐘舵��")
private Integer state;
--
Gitblit v1.9.3