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

cjl

2023-11-14 3771512ff8b1f4bd6c40cdcdff58b3a64cee78b1

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

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

    boolean updateUserId(Integer userId);

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

}