Merge branch 'developer'

Helius

2022-03-15 63541e6c20cb4393ccb12505005e9e5833cd0b0a

 zq-erp/src/main/java/com/matrix/system/common/actions/AdminAction.java

@@ -477,6 +477,16 @@


    /**
     * 查询所有员工
     */
    @RequestMapping(value = "/allUser")
    public @ResponseBody
    AjaxResult allUser() {
        return new AjaxResult(AjaxResult.STATUS_SUCCESS, sysUsersService.findByRoleName(false, null));
    }


    /**
     * 根据角色名称查询店铺的员工
     */
    @RequestMapping(value = "/getShopStaffByRoleName")