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

cjl

2023-12-18 68e750bf109efb0469704e54e48a29649512358c

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

@@ -54,6 +54,7 @@

    boolean updateUserId(Integer userId);

    // 小程序推送
    void pushOneUser(Allocation appAllocationPushUserCond);

}