Merge remote-tracking branch 'origin/master'

zqy

8 天以前 bc679a9077a7ede5b61349645cbb5f411d703949

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

@@ -22,6 +22,8 @@
public interface ZInfoUserService extends IService<ZInfoUser> {


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

    void setSpouseOnly(Long spouse);

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