Merge remote-tracking branch 'origin/score_shop' into score_shop

jyy

2021-04-14 6ada97d503bd93722c081b66a9adcce7599e5536

 zq-erp/src/main/resources/config/system.properties

@@ -30,7 +30,7 @@
redis.password=xcong123
#\u5BA2\u6237\u7AEF\u8D85\u65F6\u65F6\u95F4\u5355\u4F4D\u662F\u6BEB\u79D2 \u9ED8\u8BA4\u662F2000
redis.timeout=10000  
redis.database=1
redis.database=2
redis_time_out=1800000
cookie_time_out=36000