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

houruijun

2020-08-07 98fb4b2802f949a730b87f55a8d100272817ac3e

 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();