Merge remote-tracking branch 'origin/hive2.0' into hive2.0

935090232@qq.com

2021-02-20 5f377d1f45b85fba841794a93e67b03622613479

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

@@ -435,6 +435,15 @@
        return result;
    }

    @RequestMapping(value = "/getUserById")
    public @ResponseBody
    AjaxResult getUserById(Long id) {
        AjaxResult result = AjaxResult.buildSuccessInstance("");
        SysUsers user = sysUsersService.findById(id);
        result.putInMap("user", user);
        return result;
    }


    /**
     * 条件查询所有员工，不分页