From dd6cab3f295e2e9f127313c1ea3dde09eccb2ce6 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 11 Jun 2021 21:57:50 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop

---
 zq-erp/src/main/java/com/matrix/ZqErpApplication.java |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/ZqErpApplication.java b/zq-erp/src/main/java/com/matrix/ZqErpApplication.java
index 2941bcc..4502fc0 100644
--- a/zq-erp/src/main/java/com/matrix/ZqErpApplication.java
+++ b/zq-erp/src/main/java/com/matrix/ZqErpApplication.java
@@ -10,9 +10,7 @@
  * @author jiangyouyao
  */
 @SpringBootApplication
-
 @ComponentScan(basePackages = {"com.matrix.**"})
-
 public class ZqErpApplication {
 
     public static void main(String[] args) {

--
Gitblit v1.9.1