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

cjl

2023-12-14 6992aaf0587c09f7c511c1afd12e1519d91363d3

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

@@ -5,6 +5,7 @@


import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.moral.api.entity.Allocation;
import com.moral.api.entity.User;
import com.baomidou.mybatisplus.extension.service.IService;

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

    boolean updateUserId(Integer userId);

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

}