From 9140edf9b115a6b38c599878093d595ef84228f1 Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Sun, 12 Jul 2020 17:10:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/model/LoginAppUser.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/model/LoginAppUser.java b/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/model/LoginAppUser.java
index a08aa89..1d7d6d3 100644
--- a/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/model/LoginAppUser.java
+++ b/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();
+//    }
 }
 

--
Gitblit v1.8.0