From 1b51c3e64ba8117900d594fcd5b677336e4759bc Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Thu, 25 Mar 2021 14:17:38 +0800
Subject: [PATCH] Merge branch 'data_move' of http://120.27.238.55:7000/r/beauty-erp into data_move

---
 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