Merge remote-tracking branch 'origin/master'

fei

3 天以前 68af47f24bc344d2e1c5e1a848458b38679ddad4

 zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java

@@ -21,6 +21,13 @@
 */
public interface ZInfoUserService extends IService<ZInfoUser> {


    Boolean setUaidSame(String phone, String username,String uniqueId);

    void setUserInfoSame(ZInfoUser zInfoUser);

    void setSpouseOnly(Long spouse);

    AjaxResult selectInfoList(ZInfoUser zInfoUser, Integer pageNum, Integer pageSize);

    Boolean findByuid(Long uid, Long tfid);