From 6beb066cae877ac1ec9b3627fc83bab9a018d3cd Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 07 Apr 2021 16:32:37 +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 |   11 +++++++++++
 1 files changed, 11 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 e12109a..9868e2b 100644
--- a/zq-erp/src/test/java/com/matrix/ParameterSettingsTool.java
+++ b/zq-erp/src/test/java/com/matrix/ParameterSettingsTool.java
@@ -3,6 +3,7 @@
 import cn.hutool.core.collection.CollectionUtil;
 import com.matrix.system.common.bean.BusParameterSettings;
 import com.matrix.system.common.bean.SysCompany;
+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.hive.bean.ParameterSettings;
@@ -53,6 +54,16 @@
 		newSetting1.setCategory("APP设置");
 		newSettings.add(newSetting1);
 
+		ParameterSettings newSetting2=new ParameterSettings();
+		newSetting2.setCode(AppConstance.WAREHOUSE_MANAGE_STOCK);
+		newSetting2.setName("是否管理产品库存");
+		newSetting2.setType(1);
+		newSetting2.setCategory("仓库设置");
+		newSettings.add(newSetting2);
+
+
+
+
 		for (ParameterSettings newSetting : newSettings) {
 			List<ParameterSettings> parameterSettings = parameterSettingsDao.selectByModel(newSetting);
 			if(CollectionUtil.isEmpty(parameterSettings)){

--
Gitblit v1.9.1