Merge remote-tracking branch 'origin/zyqs-0502' into zyqs-0502

zj

2024-06-04 935b27a40c549f3ebc15e7e9654cdfd01e8eab13

 src/main/java/com/nq/controller/backend/AdminLogsController.java

@@ -62,7 +62,7 @@
    @RequestMapping("optionList.do")
    @ResponseBody
    public ServerResponse optionList(@RequestParam(value = "userId", required = false) Integer userId, @RequestParam(value = "pageNum", defaultValue = "1") int pageNum, @RequestParam(value = "pageSize", defaultValue = "10") int pageSize){
        return this.iSiteUserOptionLogService.list(userId,pageNum,pageSize);
        return this.iSiteUserOptionLogService.list(null,userId,pageNum,pageSize);
    }

    //分页查询日志管理 所有短信日志信息