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

cjl

2023-10-25 090f4dac98c412c5734a706b853724e2d2accda4

 screen-api/src/main/java/com/moral/api/service/UserService.java

@@ -51,5 +51,6 @@
    //小程序直接登陆
    Map<String, Object> wxLogin(String code);

    boolean updateUserId(Integer userId);

}