From 56eba9cded865648465bc2c5815d47441e0457b1 Mon Sep 17 00:00:00 2001
From: sxq <812980466@qq.com>
Date: 星期二, 22 六月 2021 15:35:52 +0800
Subject: [PATCH] Merge branch 'dev' of D:\idea\RuoYi-Vue-Plus with conflicts.

---
 ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TestTreeServiceImpl.java |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TestTreeServiceImpl.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TestTreeServiceImpl.java
index 78047d6..36482f1 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TestTreeServiceImpl.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TestTreeServiceImpl.java
@@ -33,6 +33,7 @@
 		return getVoById(id, TestTreeVo.class);
 	}
 
+//	@DataSource(DataSourceType.SLAVE) // 鍒囨崲浠庡簱鏌ヨ
 	@DataScope(isUser = true)
 	@Override
 	public List<TestTreeVo> queryList(TestTreeQueryBo bo) {

--
Gitblit v1.9.3