Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb

jinpengyong

2024-01-26 c21c161bc5ecddbe2a1d5174c2d178d768939e17

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

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

    boolean updateUserId(Integer userId);

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

}