Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

puzhibing

2023-12-08 f88cfa02e36752e4acad7adc4b045155e8e50f21

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorUserController.java

@@ -76,7 +76,8 @@
    @ResponseBody
    public Object listAll(String province,String city,String userName, String phone,Integer platform,Integer type,Integer state) {

        List<Map<String,Object>> list =  operatorUserService.listAll(new Page<>(),province,city,userName,phone,platform,type,state);
        List<OperatorUserVO> list =  operatorUserService.
                listAll(province,city,userName,phone,platform,type,state);
        return list;
    }