From f8a3a9826738a397bdf4aff4ca7a5116344b5a0a Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 09 五月 2024 07:26:56 +0800
Subject: [PATCH] 实现报告生成合并单元格；修复部分bug
---
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..1a6fef4 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