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/prd/application.properties | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/zq-erp/src/main/resources/config/prd/application.properties b/zq-erp/src/main/resources/config/prd/application.properties index dc05d4e..c04fee1 100644 --- a/zq-erp/src/main/resources/config/prd/application.properties +++ b/zq-erp/src/main/resources/config/prd/application.properties @@ -2,12 +2,10 @@ server.port=8080 -#spring.datasource.username=hive_data -#spring.datasource.password=hive_4321#&@ -#spring.datasource.url=jdbc:mysql://119.3.52.84:3306/hive_prd?useUnicode=true&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8 -spring.datasource.username=chuhuan -spring.datasource.password=chuhuan -spring.datasource.url=jdbc:mysql://175.6.132.141:3306/hive_v2_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8 + +spring.datasource.username=hive +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 @@ -42,7 +40,7 @@ #rabbitMQ配置 -rabbitmq.host=127.0.0.1 +rabbitmq.host=47.111.134.136 rabbitmq.port=5672 rabbitmq.username=hivequeue rabbitmq.password=hivequeueadmin -- Gitblit v1.9.1