From 1f27afeb9a001ef9df74011ab4ab2a64a3f2c5db Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 12 Apr 2021 14:44:39 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop

---
 zq-erp/src/test/java/com/matrix/ParameterSettingsTool.java |    6 ++++++
 1 files changed, 6 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 a29c349..eccda8a 100644
--- a/zq-erp/src/test/java/com/matrix/ParameterSettingsTool.java
+++ b/zq-erp/src/test/java/com/matrix/ParameterSettingsTool.java
@@ -68,6 +68,12 @@
 		newSetting3.setCategory("微信开发配置");
 		newSettings.add(newSetting3);
 
+		ParameterSettings newSetting4=new ParameterSettings();
+		newSetting4.setCode(AppConstance.SHOP_MANAGE_JJCPAS_CONSUME);
+		newSetting4.setName("家居产品销售是否生成消耗业绩");
+		newSetting4.setType(1);
+		newSetting4.setCategory("店务配置");
+		newSettings.add(newSetting4);
 
 
 

--
Gitblit v1.9.1