From 9e7a2db4b0c309cd7dd653857302a123211372ce Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期一, 27 五月 2024 17:23:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
user-server/src/main/java/com/yuanchu/mom/dto/Custom.java | 12 +++++++-----
user-server/src/main/resources/mapper/CustomMapper.xml | 2 +-
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/user-server/src/main/java/com/yuanchu/mom/dto/Custom.java b/user-server/src/main/java/com/yuanchu/mom/dto/Custom.java
index 5a82e45..38bd80a 100644
--- a/user-server/src/main/java/com/yuanchu/mom/dto/Custom.java
+++ b/user-server/src/main/java/com/yuanchu/mom/dto/Custom.java
@@ -32,7 +32,7 @@
@ApiModelProperty(value = "瀹㈡埛鍚嶇О")
private String name;
- @ValueTableShow(9)
+ @ValueTableShow(11)
@ApiModelProperty(value = "璐﹀彿鐘舵��")
private Integer state;
@@ -51,11 +51,11 @@
@ApiModelProperty(value = "瀹㈡埛鍗曚綅")
private String company;
- @ValueTableShow(8)
+ @ValueTableShow(9)
@ApiModelProperty(value = "鍗曚綅鍦板潃")
private String address;
- @ValueTableShow(8)
+ @ValueTableShow(12)
@ApiModelProperty(value = "宸ュ巶鍩�")
private String code;
@@ -63,7 +63,7 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
- @ValueTableShow(9)
+ @ValueTableShow(13)
@ApiModelProperty(value = "鍒涘缓鏃ユ湡")
@TableField(fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -77,16 +77,18 @@
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
- @ValueTableShow(10)
+ @ValueTableShow(14)
@ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
@TableField(exist = false)
private String updateUserName;
private Integer isCustom;
+ @ValueTableShow(8)
@ApiModelProperty(value = "鑻辨枃瀹㈡埛鍗曚綅")
private String companyEn;
+ @ValueTableShow(10)
@ApiModelProperty(value = "鑻辨枃鍗曚綅鍦板潃")
private String addressEn;
}
diff --git a/user-server/src/main/resources/mapper/CustomMapper.xml b/user-server/src/main/resources/mapper/CustomMapper.xml
index 98bde59..016bc49 100644
--- a/user-server/src/main/resources/mapper/CustomMapper.xml
+++ b/user-server/src/main/resources/mapper/CustomMapper.xml
@@ -7,7 +7,7 @@
</update>
<select id="selectCustomPageList" resultType="com.yuanchu.mom.dto.Custom">
select * from (
- select u1.id, u1.account, u1.name, u1.state, u1.update_time, u1.update_user, u1.age, u1.email, u1.phone, u1.department, u1.company, u1.address, u2.name update_user_name, u1.code
+ select u1.id, u1.account, u1.name, u1.state, u1.update_time, u1.update_user, u1.age, u1.email, u1.phone, u1.department, u1.company, u1.address, u2.name update_user_name, u1.code,u1.company_en,u1.address_en
from user u1
left join user u2 on u2.id = u1.update_user
where u1.is_custom = 1
--
Gitblit v1.9.3