Merge branch 'dev1.1' into dev

zhaoxiaohao

2021-03-01 7ea2a2cfe922c9b2d5c09c737d10a7f1ab5b50d1

 kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/model/LoginAppUser.java

@@ -64,7 +64,6 @@
    public String getUserId() {
        return getOpenId();
    }

//    @Override
//    public List<SysOrganization> getOrganizations() {
//        return getOrganizations();