From 9dfddb73a329af5afb72c47ba0fd500962f78321 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Thu, 08 Apr 2021 19:13:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop

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

diff --git a/zq-erp/src/main/resources/config/application.properties b/zq-erp/src/main/resources/config/application.properties
index a250611..2a2ae62 100644
--- a/zq-erp/src/main/resources/config/application.properties
+++ b/zq-erp/src/main/resources/config/application.properties
@@ -1,4 +1,4 @@
-evn=jyy
+evn=dev
 server.port=8080
 
 
@@ -55,7 +55,7 @@
 groupBuy.pay.timeLimit=30
 
 #定时任务
-scheduling.enabled=false
+scheduling.enabled=true
 
 swagger.enable=true
 swagger.security.username=admin

--
Gitblit v1.9.1