From e3853368e05aad326fdbb7e1057d23cb77918c7b Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期二, 14 五月 2024 02:25:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
user-server/src/main/java/com/yuanchu/mom/pojo/User.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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 fa96e20..ab26b1b 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
@@ -35,9 +35,9 @@
@ApiModelProperty(value = "濮撳悕")
private String name;
-// @ValueTableShow(2)
-// @ApiModelProperty(value = "濮撳悕EN")
-// private String nameEn;
+ @ValueTableShow(2)
+ @ApiModelProperty(value = "濮撳悕EN")
+ private String nameEn;
@ValueTableShow(3)
@ApiModelProperty(value = "鐘舵��")
@@ -62,7 +62,7 @@
@ApiModelProperty(value = "鍗曚綅")
private String company;
- @ValueTableShow(8)
+ @ValueTableShow(14)
@ApiModelProperty(value = "鍗曚綅鍦板潃")
private String address;
--
Gitblit v1.9.3