diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/domain/User.java b/yshop-system/src/main/java/co/yixiang/modules/system/domain/User.java
index 6403195b..13f6b718 100644
--- a/yshop-system/src/main/java/co/yixiang/modules/system/domain/User.java
+++ b/yshop-system/src/main/java/co/yixiang/modules/system/domain/User.java
@@ -45,7 +45,7 @@ public class User implements Serializable {
 
 
     /** 状态：1启用、0禁用 */
-    private Long enabled;
+    private Boolean enabled;
 
     /** 用户头像 */
     @TableField(exist = false)
diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/rest/RoleController.java b/yshop-system/src/main/java/co/yixiang/modules/system/rest/RoleController.java
index 87440652..8c5238ea 100644
--- a/yshop-system/src/main/java/co/yixiang/modules/system/rest/RoleController.java
+++ b/yshop-system/src/main/java/co/yixiang/modules/system/rest/RoleController.java
@@ -79,7 +79,7 @@ public class RoleController {
     @GetMapping(value = "/all")
     @PreAuthorize("@el.check('roles:list','user:add','user:edit')")
     public ResponseEntity<Object> getAll(RoleQueryCriteria criteria ,@PageableDefault(value = 2000, sort = {"level"}, direction = Sort.Direction.ASC) Pageable pageable){
-        return new ResponseEntity<>(roleService.queryAll(criteria,pageable),HttpStatus.OK);
+        return new ResponseEntity<>(roleService.queryAlls(criteria,pageable),HttpStatus.OK);
     }
 
     @Log("查询角色")
diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/service/RoleService.java b/yshop-system/src/main/java/co/yixiang/modules/system/service/RoleService.java
index 02c14b4b..22e2aad4 100644
--- a/yshop-system/src/main/java/co/yixiang/modules/system/service/RoleService.java
+++ b/yshop-system/src/main/java/co/yixiang/modules/system/service/RoleService.java
@@ -37,6 +37,14 @@ public interface RoleService  extends BaseService<Role>{
     */
     Map<String,Object> queryAll(RoleQueryCriteria criteria, Pageable pageable);
 
+
+    /**
+     * 查询数据分页
+     * @param pageable 分页参数
+     * @return Map<String,Object>
+     */
+    Object queryAlls(RoleQueryCriteria criteria, Pageable pageable);
+
     /**
     * 查询所有数据不分页
     * @param criteria 条件参数
diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/RoleServiceImpl.java b/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/RoleServiceImpl.java
index 5b8e7406..e11a596b 100644
--- a/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/RoleServiceImpl.java
+++ b/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/RoleServiceImpl.java
@@ -85,6 +85,18 @@ public class RoleServiceImpl extends BaseServiceImpl<RoleMapper, Role> implement
         return map;
     }
 
+    /**
+     * 查询数据分页
+     *
+     * @param pageable 分页参数
+     * @return Object
+     */
+    @Override
+    public Object queryAlls(RoleQueryCriteria criteria,Pageable pageable) {
+        List<Role> roleList =  baseMapper.selectList(QueryHelpPlus.getPredicate(Role.class, criteria));
+        return roleList;
+    }
+
 
     @Override
     public List<Role> queryAll(RoleQueryCriteria criteria){