From f30b57f80a0a700f277212987d651ffa29074688 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 28 五月 2024 18:05:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
user-server/src/main/resources/mapper/CustomMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
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