From cd56d5963f7234a03fec057d807ad1607be17c23 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 25 Jun 2021 16:47:17 +0800
Subject: [PATCH] conflect

---
 pom.xml |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/pom.xml b/pom.xml
index ac3a5f5..a0d43e8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,6 +23,7 @@
         <module>gc-sys</module>
         <module>gc-pay</module>
         <module>gc-role</module>
+        <module>gc-shop</module>
         <!--<module>gc-admin</module>-->
     </modules>
     <packaging>pom</packaging>

--
Gitblit v1.9.1