From 1ad851e4eb8c972eeb2fee7f2d1d54d3e32068a9 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Wed, 15 Jul 2020 09:48:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/resources/application.yml | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/resources/application.yml b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/resources/application.yml
index e657ca1..abd77b4 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/resources/application.yml
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/resources/application.yml
@@ -53,7 +53,7 @@
second: 1800
#多租户配置
tenant:
- enable: true
+ enable: false
#多租户隔离字段
tenantid: tenant_id
ignoreTables:
@@ -71,7 +71,9 @@
- sys_department
- sys_area
- sys_company
+ - sys_role_organization
ignoreSqls:
- com.kidgrow.usercenter.mapper.SysRoleMapper.findAll
+ - com.kidgrow.usercenter.mapper.SysUserMapper.findAppointUsers
--
Gitblit v1.8.0