Merge remote-tracking branch 'origin/master'

fei

3 天以前 68af47f24bc344d2e1c5e1a848458b38679ddad4

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

@@ -22,7 +22,9 @@
public interface ZInfoUserService extends IService<ZInfoUser> {


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

    void setUserInfoSame(ZInfoUser zInfoUser);

    void setSpouseOnly(Long spouse);