From 35cea8fd3552a048ed49d0596b647c983e148644 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Thu, 29 Jul 2021 20:39:39 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger

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

diff --git a/zq-erp/src/main/resources/config/mdprd/system.properties b/zq-erp/src/main/resources/config/mdprd/system.properties
index 4ac1ef2..b601be1 100644
--- a/zq-erp/src/main/resources/config/mdprd/system.properties
+++ b/zq-erp/src/main/resources/config/mdprd/system.properties
@@ -25,7 +25,7 @@
 #\u5982\u679C\u6709\u5BC6\u7801
 redis.password=xcong123
 #\u5BA2\u6237\u7AEF\u8D85\u65F6\u65F6\u95F4\u5355\u4F4D\u662F\u6BEB\u79D2 \u9ED8\u8BA4\u662F2000
-redis.timeout=10000  
+redis.timeout=10000
 redis.database=1
 redis_time_out=1800000
 

--
Gitblit v1.9.1