From 7c92603d6548e7405a298d3c4996942acd999376 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Wed, 14 Jul 2021 17:35:30 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger

---
 zq-erp/src/test/java/com/matrix/ParameterSettingsTool.java |    7 +++++++
 1 files changed, 7 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..762da8b 100644
--- a/zq-erp/src/test/java/com/matrix/ParameterSettingsTool.java
+++ b/zq-erp/src/test/java/com/matrix/ParameterSettingsTool.java
@@ -90,6 +90,13 @@
 		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);
+
 
 		for (ParameterSettings newSetting : newSettings) {
 			List<ParameterSettings> parameterSettings = parameterSettingsDao.selectByModel(newSetting);

--
Gitblit v1.9.1