Merge branch 'dev' into pay_master

zhaoxiaohao

2020-09-29 0bad58cb6d46ec5c111d3adaee11337c5ccd5d9c

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