From 1d394446abb8465e63fd1fd9a768796e149edbd6 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Wed, 06 Oct 2021 19:52:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/test/java/com/matrix/ParameterSettingsTool.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/zq-erp/src/test/java/com/matrix/ParameterSettingsTool.java b/zq-erp/src/test/java/com/matrix/ParameterSettingsTool.java
index b74acde..a3fab25 100644
--- a/zq-erp/src/test/java/com/matrix/ParameterSettingsTool.java
+++ b/zq-erp/src/test/java/com/matrix/ParameterSettingsTool.java
@@ -90,6 +90,21 @@
newSetting6.setCategory("店务配置");
newSettings.add(newSetting6);
+ ParameterSettings newSetting7=new ParameterSettings();
+ newSetting7.setCode(AppConstance.SHOP_MANAGE_GIFTISFREE);
+ newSetting7.setName("赠送金额购买产品算赠送购买");
+ newSetting7.setType(1);
+ newSetting7.setCategory("店务配置");
+ newSettings.add(newSetting7);
+
+
+ ParameterSettings newSetting8=new ParameterSettings();
+ newSetting8.setCode(AppConstance.SHOP_MANAGE_ABLE_CANCEL_DFK_ORDER);
+ newSetting8.setName("门店是否只能取消待付款订单,服务单");
+ newSetting8.setType(1);
+ newSetting8.setCategory("店务配置");
+ newSettings.add(newSetting8);
+
for (ParameterSettings newSetting : newSettings) {
List<ParameterSettings> parameterSettings = parameterSettingsDao.selectByModel(newSetting);
--
Gitblit v1.9.1