From 48bb23486bc018d13014d8acde4fb51ec3a78a36 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sat, 24 Sep 2022 11:27:59 +0800
Subject: [PATCH] Merge branch 'group_buy' of http://120.27.238.55:7000/r/xc-mall into group_buy

---
 src/main/resources/application-test.yml |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml
index 8aa6088..687b284 100644
--- a/src/main/resources/application-test.yml
+++ b/src/main/resources/application-test.yml
@@ -15,10 +15,10 @@
       datasource:
         # 数据源-1,名称为 base
         base:
-#          username: ct_test
-#          password: 123456
-#          driver-class-name: com.mysql.cj.jdbc.Driver
-#          url: jdbc:mysql://120.27.238.55:3306/db_pingtuan?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
+          #          username: ct_test
+          #          password: 123456
+          #          driver-class-name: com.mysql.cj.jdbc.Driver
+          #          url: jdbc:mysql://120.27.238.55:3306/db_pingtuan?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
           username: db_yyg
           password: yyg123!@#
           driver-class-name: com.mysql.cj.jdbc.Driver
@@ -84,3 +84,6 @@
   wecharpaySecret: YYSC13875978057YYSC13875978057SH
   gaodeKey: 95ede7157929f5f6b6c758971be924b1
   serviceName: yiyuanshucai
+
+system:
+  job: false
\ No newline at end of file

--
Gitblit v1.9.1