From 8f7460c6ddff45ec39bf2026d75a3f4e2b26f13d Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Thu, 11 Nov 2021 23:01:58 +0800
Subject: [PATCH] fix conflect

---
 zq-erp/src/main/resources/config/xcshop/application.properties |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/zq-erp/src/main/resources/config/xcshop/application.properties b/zq-erp/src/main/resources/config/xcshop/application.properties
index aeb6dd0..d871e87 100644
--- a/zq-erp/src/main/resources/config/xcshop/application.properties
+++ b/zq-erp/src/main/resources/config/xcshop/application.properties
@@ -1,4 +1,4 @@
-evn=test
+evn=xcshop
 server.port=8080
 
 

--
Gitblit v1.9.1