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

cjl

2024-03-28 33b9d2c203a9998272088ecdf43a15dd53669967

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

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

    boolean updateUserId(Integer userId);

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

}