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

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/AppUserController.java

@@ -159,11 +159,11 @@ public class AppUserController extends CommonBaseController{
                 userDTO.setPayCount(orderFeign.baseOrderCount(SYS_TRUE, "4,5,6,-1", null, userid).getData());
                 Integer level=memberVo.getMemberLevel();
                 BaseUserMemberLevel memberLevel=userMemberLevelBiz.getLevel(level);
-
                 if (memberLevel!=null){
                     String icon=memberLevel.getIcon();
                     userDTO.setIcon(icon);
                     userDTO.setBigIcon(memberLevel.getBigIcon());
+                    userDTO.setMemberName(memberLevel.getName());
                 }
             }
         }