From 4351e71d782741143a98f86f6648acd16689165f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 27 May 2022 19:48:02 +0800
Subject: [PATCH] Merge branch 'developer' into hive2.0

---
 zq-erp/src/main/java/com/matrix/system/common/service/impl/InitShopProductCateService.java |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/common/service/impl/InitShopProductCateService.java b/zq-erp/src/main/java/com/matrix/system/common/service/impl/InitShopProductCateService.java
index d84991c..f6850fe 100644
--- a/zq-erp/src/main/java/com/matrix/system/common/service/impl/InitShopProductCateService.java
+++ b/zq-erp/src/main/java/com/matrix/system/common/service/impl/InitShopProductCateService.java
@@ -2,9 +2,6 @@
 
 import com.matrix.core.constance.MatrixConstance;
 import com.matrix.system.common.bean.SysCompany;
-import com.matrix.system.common.bean.SysRole;
-import com.matrix.system.common.dao.SysRoleDao;
-import com.matrix.system.constance.Dictionary;
 import com.matrix.system.shopXcx.bean.ShopProductAttribute;
 import com.matrix.system.shopXcx.dao.ShopProductAttributeDao;
 import org.springframework.beans.BeanUtils;
@@ -40,7 +37,8 @@
 
         ShopProductAttribute service=new ShopProductAttribute();
         BeanUtils.copyProperties(cpfl,service);
-        service.setAttrName("服务");
+        service.setAttrName("属性");
+        service.setAttrCode("service");
         shopProductAttributeDao.batchInsert(Arrays.asList(cpfl,service));
 
 

--
Gitblit v1.9.1