From 4cb590cfe7bc615207bd7fdfcf30295a038e470e Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 23 Jun 2021 11:16:03 +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 | 8 ++++++++
1 files changed, 8 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 22b54cf..b74acde 100644
--- a/zq-erp/src/test/java/com/matrix/ParameterSettingsTool.java
+++ b/zq-erp/src/test/java/com/matrix/ParameterSettingsTool.java
@@ -6,6 +6,7 @@
import com.matrix.system.common.constance.AppConstance;
import com.matrix.system.common.dao.BusParameterSettingsDao;
import com.matrix.system.common.dao.SysCompanyDao;
+import com.matrix.system.constance.Dictionary;
import com.matrix.system.hive.bean.ParameterSettings;
import com.matrix.system.hive.dao.ParameterSettingsDao;
import org.junit.Test;
@@ -82,6 +83,13 @@
newSetting5.setCategory("微商城配置");
newSettings.add(newSetting5);
+ ParameterSettings newSetting6=new ParameterSettings();
+ newSetting6.setCode(Dictionary.ZS_CONSUME_ACHIEVE);
+ newSetting6.setName("赠送项目是否计算消耗业绩");
+ newSetting6.setType(1);
+ newSetting6.setCategory("店务配置");
+ newSettings.add(newSetting6);
+
for (ParameterSettings newSetting : newSettings) {
List<ParameterSettings> parameterSettings = parameterSettingsDao.selectByModel(newSetting);
--
Gitblit v1.9.1