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

cjl

2023-11-07 54beb665319b66742cdec3dffb7e298701d61582

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

@@ -9,7 +9,7 @@
import com.baomidou.mybatisplus.extension.service.IService;

import com.moral.api.pojo.bo.UserBO;
import com.moral.api.pojo.query.AppUserCond;
import com.moral.api.pojo.query.app.AppAllocationPushUserCond;

/**
 * <p>
@@ -51,5 +51,8 @@
    //小程序直接登陆
    Map<String, Object> wxLogin(String code);

    boolean updateUserId(Integer userId);

    void pushOneUser(AppAllocationPushUserCond appAllocationPushUserCond);

}