Merge remote-tracking branch 'origin/pay_master' into pay_master

houruijun

2020-09-28 e0395c5454534e7cf657b10045d00e4042dc7e71

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysOrganizationController.java

@@ -127,7 +127,7 @@
            }
            return ResultBody.failed().msg(errMsg.toString());
        } else {
            boolean v = sysOrganizationService.saveOrUpdate(sysOrganization);
            boolean v = sysOrganizationService.saveOrUpdateSer(sysOrganization);
            if (v) {
                return ResultBody.ok().data(sysOrganization).msg("保存成功");
            } else {