From 2c481ac06298b5c464fd927893ce4c62b03c39c0 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 09 Mar 2022 17:46:27 +0800
Subject: [PATCH] Merge branch 'developer' into alpha

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

diff --git a/zq-erp/src/main/java/com/matrix/config/MvcCoreConfig.java b/zq-erp/src/main/java/com/matrix/config/MvcCoreConfig.java
index c3067f7..04e60ee 100644
--- a/zq-erp/src/main/java/com/matrix/config/MvcCoreConfig.java
+++ b/zq-erp/src/main/java/com/matrix/config/MvcCoreConfig.java
@@ -21,7 +21,6 @@
  * @date 2019-06-14 15:50
  */
 @Configuration()
-@PropertySource("classpath:config/system.properties")
 public class MvcCoreConfig implements WebMvcConfigurer {
 
 	@Autowired

--
Gitblit v1.9.1