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

zhaoxiaohao

2020-04-10 eab02ab1453dc1f1e9933077dde1cef67d798936

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

@@ -80,7 +80,7 @@
            return ResultBody.failed().msg(errMsg.toString());
        } else {
            //如果父级id是空的，默认填-1
            if (sysArea.getAreaParentId().toString()=="") {
            if (sysArea.getAreaParentId()==null) {
                sysArea.setAreaParentId(-1L);
            }
            //添加的时候得判断主键唯一