解决冲突

mitao

2025-03-16 ff4e5b862d7f1b56fca79b283d6afd33ade12648

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/IPartyMemberService.java

@@ -82,5 +82,12 @@
     */
    void audit(PartyMemberDTO dto, SystemUserVo loginUserInfo);

    /**
     * 根据电话号码查询有效的党员数据
     * @param phone
     * @return
     */
    PartyMember getPartyMemberByPhone(String phone);

    Page<PendingPartyMemberApplicationVO> preAuditList(Page<PendingPartyMemberApplicationVO> page, LoginUserInfoVO loginUserInfo);
}