From 6fd4bdff55620c562e0a22eee3c95924951b04a4 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Thu, 24 Sep 2020 14:10:28 +0800
Subject: [PATCH] Merge branch 'pay_master' of ssh://192.168.2.240:29418/kidgrow-microservices-platform into pay_master

---
 kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/model/LoginAppUser.java |    1 -
 1 files changed, 0 insertions(+), 1 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 8326d16..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,7 +64,6 @@
     public String getUserId() {
         return getOpenId();
     }
-
 //    @Override
 //    public List<SysOrganization> getOrganizations() {
 //        return getOrganizations();

--
Gitblit v1.8.0