Merge branch 'master-customer-management' into dev

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

@@ -34,14 +34,13 @@ public class AppStaffUserController extends BaseController<AppStaffUserBiz, AppS
      * @return
      * @throws Exception
      */
-    @Override
     @GetMapping("/all")
-    public  List<AppStaffUser> all() throws Exception {
+    public  ObjectRestResponse<List<AppStaffUser>> getAll() throws Exception {
         AppUserDTO userDTO = (AppUserDTO) publicController.userDetailByToken(authConfig.getToken(request)).getData();
         if (POSITION_NAME.equals(userDTO.getPositionName())) {
-         return baseBiz.getAll(userDTO.getUserid()) ;
+         return ObjectRestResponse.succ(baseBiz.getAll(userDTO.getUserid())) ;
         }
-     return new ArrayList<>();
+     return ObjectRestResponse.succ();
     }
 
     @Override