Merge branch 'developer' into hive2.0

Helius

2022-05-27 4351e71d782741143a98f86f6648acd16689165f

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