Merge remote-tracking branch 'origin/cjl' into dev

cjl

2023-10-27 165f11c315a0283c6cf32572dddee5c81351cad8

 screen-api/src/main/java/com/moral/api/controller/AppUserController.java

@@ -55,7 +55,7 @@
    }

    @GetMapping("/wx/exit")
    @ApiOperation(value = "小程序登陆")
    @ApiOperation(value = "小程序退出")
    public ResultMessage updateUserId(@RequestParam @ApiParam(value = "userId",name = "用户主键") Integer userId) {
        userService.updateUserId(userId);
        return ResultMessage.ok();