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

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
-        ml.isdel=0
+        where ml.isdel = 0
         ) m
         on
         l.id = m.user_id