From 0e4b49f4bee160790b1830e6a8606e739b32fc3b Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期三, 11 三月 2026 09:09:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/resources/mappers/SystemDictMapper.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/server/dmmall_service/src/main/resources/mappers/SystemDictMapper.xml b/server/dmmall_service/src/main/resources/mappers/SystemDictMapper.xml
index 76338cb..2bbec78 100644
--- a/server/dmmall_service/src/main/resources/mappers/SystemDictMapper.xml
+++ b/server/dmmall_service/src/main/resources/mappers/SystemDictMapper.xml
@@ -19,9 +19,9 @@
dict.`ID`, dict.`CODE`, dict.`NAME`, dict.`REMARK`, dict.`CREATE_TIME`, dict.`UPDATE_TIME`, dict.`CREATE_USER`, dict.`UPDATE_USER`,
create_user.ID CREATE_USER_ID, create_user.`USERNAME` CREATE_USER_NAME,
update_user.ID UPDETE_USER_ID, update_user.`USERNAME` UPDATE_USER_NAME
- FROM SYSTEM_DICT dict
- LEFT JOIN `SYSTEM_USER` create_user ON create_user.ID = dict.CREATE_USER
- LEFT JOIN `SYSTEM_USER` update_user ON update_user.ID = dict.UPDATE_USER
+ FROM system_dict dict
+ LEFT JOIN `system_user` create_user ON create_user.ID = dict.CREATE_USER
+ LEFT JOIN `system_user` update_user ON update_user.ID = dict.UPDATE_USER
<where>
dict.DELETED = 0
<if test="dto.code != null and dto.code != ''">
--
Gitblit v1.9.3