Merge branch 'dev' of ssh://10.10.100.21/source/smartschool-platform into dev

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/basic/service/impl/StudentServiceImpl.java

@@ -174,7 +174,7 @@ public class StudentServiceImpl implements StudentService{
             for (SysParents item : updateDetails) {
                 SysParents sysParents = sysStudentMapper.selectParentById(item.getParent_id());
                 if (!ObjectUtils.isEmpty(sysParents)) {
-                    if (item.getPa_phone().equals(sysParents.getPa_phone())) {
+                    if (!item.getPa_phone().equals(sysParents.getPa_phone())) {
                         UserDO userDO = new UserDO();
                         UserDO oldUserDO = userMapper.selectUserByPhone(sysParents.getPa_phone());
                         if (!ObjectUtils.isEmpty(oldUserDO)) {