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

luliqiang

2020-07-15 02dcc4c9d043c44d0fa88490904046008fcf4afc

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

@@ -64,5 +64,9 @@
    public String getUserId() {
        return getOpenId();
    }
//    @Override
//    public List<SysOrganization> getOrganizations() {
//        return getOrganizations();
//    }
}