From bc7d9c98bc1b23ef6ef29ed4a6313753f6900640 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期二, 14 五月 2024 02:25:01 +0800
Subject: [PATCH] 费用统计查询修复; 检验下单字段调整; 下单进度查询修改; 执行优化去掉多余模板内容; 报告生成删除试验方法; 修改报告表格列宽; 修改报告删除列的统计方法

---
 user-server/src/main/java/com/yuanchu/mom/pojo/User.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 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..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
@@ -32,8 +32,12 @@
     private String password;
 
     @ValueTableShow(2)
-    @ApiModelProperty(value = "鐢ㄦ埛鍚�")
+    @ApiModelProperty(value = "濮撳悕")
     private String name;
+
+    @ValueTableShow(2)
+    @ApiModelProperty(value = "濮撳悕EN")
+    private String nameEn;
 
     @ValueTableShow(3)
     @ApiModelProperty(value = "鐘舵��")
@@ -58,7 +62,7 @@
     @ApiModelProperty(value = "鍗曚綅")
     private String company;
 
-    @ValueTableShow(8)
+    @ValueTableShow(14)
     @ApiModelProperty(value = "鍗曚綅鍦板潃")
     private String address;
 

--
Gitblit v1.9.3