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

zhaoxiaohao

2020-07-15 1ad851e4eb8c972eeb2fee7f2d1d54d3e32068a9

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