From ebbe59b6ee3378fa296441cabe8bb81b2bc200b5 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Mon, 26 Apr 2021 13:47:22 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger

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

diff --git a/zq-erp/src/main/resources/config/application.properties b/zq-erp/src/main/resources/config/application.properties
index 03d8f62..14fb986 100644
--- a/zq-erp/src/main/resources/config/application.properties
+++ b/zq-erp/src/main/resources/config/application.properties
@@ -17,7 +17,6 @@
 spring.datasource.password=hive123!@#
 spring.datasource.url=jdbc:mysql://124.70.222.34/hive_prd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
 
-
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
 spring.datasource.initialSize=3
 spring.datasource.minIdle=3

--
Gitblit v1.9.1