Merge remote-tracking branch 'origin/dev' into dev

# Conflicts: # ace-modules/ace-admin/src/main/resources/mapper/AppUserDetailMapper.xml

Merge remote-tracking branch 'origin/dev' into dev
# Conflicts: # ace-modules/ace-admin/src/main/resources/mapper/AppUserDetailMapper.xml
f40b888a · 周健威 · f11be8ef · 6ec57336 · f40b888a
Commit f40b888a authored Sep 27, 2019 by 周健威
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

AppUserDetailMapper.xml ...e-admin/src/main/resources/mapper/AppUserDetailMapper.xml +1 -2

No files found.
--- a/ace-modules/ace-admin/src/main/resources/mapper/AppUserDetailMapper.xml
+++ b/ace-modules/ace-admin/src/main/resources/mapper/AppUserDetailMapper.xml
@@ -113,8 +113,7 @@
        base_user_member_level ml
        on
        ml.level = b.member_level
-        where
+        where ml.isdel = 0
-        ml.isdel=0
        ) m
        on
        l.id = m.user_id