From f0596fb2bf8fd0ecd8332b176549dad290a6a78d Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Sat, 15 Aug 2020 19:52:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
.idea/compiler.xml | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index f73c118..318c560 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -7,7 +7,6 @@
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
<outputRelativeToContentRoot value="true" />
<module name="kidgrow-uaa-api" />
- <module name="kidgrow-swagger2-spring-boot-starter" />
<module name="kidgrow-springcloud-monitor-admin" />
<module name="kidgrow-filecenter-biz" />
<module name="kidgrow-web-hospital" />
@@ -17,6 +16,7 @@
<module name="kidgrow-jobs-samples" />
<module name="kidgrow-logcenter" />
<module name="kidgrow-springcloud-eureka" />
+ <module name="kidgrow-ribbon-spring-boot-starter" />
<module name="kidgrow-sentinel-spring-boot-starter" />
<module name="kidgrow-common-spring-boot-starter" />
<module name="kidgrow-db-spring-boot-starter" />
@@ -24,13 +24,12 @@
<module name="kidgrow-config" />
<module name="kidgrow-authclient-spring-boot-starter" />
<module name="kidgrow-uaa-biz" />
+ <module name="kidgrow-web-manager" />
<module name="kidgrow-demo-order" />
- <module name="kidgrow-mqcenter-rocket-consume" />
<module name="kidgrow-filecenter-server" />
<module name="kidgrow-springcloud-monitor-dashboard" />
<module name="kidgrow-log-spring-boot-starter" />
<module name="kidgrow-plugin-sms" />
- <module name="kidgrow-log-center" />
<module name="kidgrow-websocket-center" />
<module name="kidgrow-searchcenter-server" />
<module name="kidgrow-usercenter-server" />
@@ -41,11 +40,12 @@
<module name="kidgrow-springcloud-zuul" />
<module name="kidgrow-jobs-core" />
<module name="kidgrow-uaa-server" />
- <module name="kidgrow-searchcenter-client" />
+ <module name="kidgrow-log-center" />
<module name="kidgrow-plugin-mq" />
- <module name="kidgrow-ribbon-spring-boot-starter" />
+ <module name="kidgrow-searchcenter-client" />
+ <module name="kidgrow-swagger2-spring-boot-starter" />
<module name="kidgrow-usercenter-biz" />
- <module name="kidgrow-web-manager" />
+ <module name="kidgrow-mqcenter-rocket-consume" />
<module name="kidgrow-demo-product" />
<module name="kidgrow-jobs-admin" />
</profile>
--
Gitblit v1.8.0