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

houruijun

2020-07-22 3c470b15b952b86c1e38cb9634190a12ccf3d38d

 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 {