From ad31648c6f7a8bff1f7ccdf84b76006b9ffb78f8 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 17 Jul 2021 15:59:10 +0800
Subject: [PATCH] 1.	新增套餐中有效和无效的操作 2.	会员修改门店功能 3.	套餐新增编辑次数功能 4.	计算是否为赠送的条件为，全部为赠送金额购买且支付金额大于0 5.	打印小票功能调整间距，和收银人 6.	PC端服务单新增划扣金额展示

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

diff --git a/zq-erp/src/main/resources/config/lhx/application.properties b/zq-erp/src/main/resources/config/lhx/application.properties
index 42a5201..44b584e 100644
--- a/zq-erp/src/main/resources/config/lhx/application.properties
+++ b/zq-erp/src/main/resources/config/lhx/application.properties
@@ -1,10 +1,12 @@
 evn=lhx
 server.port=8080
 
+
 #线上测试环境
 spring.datasource.username=ct_test
 spring.datasource.password=123456
 spring.datasource.url=jdbc:mysql://120.27.238.55:3306/hive_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
+
 
 
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
@@ -39,7 +41,6 @@
 rabbitmq.port=5672
 rabbitmq.username=ct_rabbit
 rabbitmq.password=123456
-useRabbit=false
 
 server.session.timeout=120
 
@@ -55,4 +56,4 @@
 #定时任务
 scheduling.enabled=true
 
-swagger.enable=false
\ No newline at end of file
+swagger.enable=true
\ No newline at end of file

--
Gitblit v1.9.1