Merge remote-tracking branch 'origin/master'

fei

3 天以前 68af47f24bc344d2e1c5e1a848458b38679ddad4

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -537,6 +537,8 @@

                if(same){
                    zInfoUserService.setUserInfoSame(infoUser);
                    marrySelfService.setMarryInfoSame(infoUser,marrySelf.getId());

                }

                // 5.5.1 更新配偶关联信息