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

cjl

2023-11-02 a0a6f95ec5b92be03385eea83b64bf97fcbfa17e

 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);

}