提交修改

blade-service/blade-client/src/main/java/org/springblade/client/goods/excel/GoodsExcel.java

@@ -33,6 +33,10 @@ public class GoodsExcel implements Serializable {
 	@ExcelProperty("规格尺寸")
 	private String specs;
 
+	@ExcelProperty("0:商品/产品  1:事务")
+	private String type;
+
+
 	@ExcelProperty("产品类型")
 	private String category;
 

blade-service/blade-client/src/main/java/org/springblade/client/goods/excel/GoodsImport.java

@@ -21,6 +21,6 @@ public class GoodsImport implements ExcelImporter<GoodsExcel> {
 	private final Boolean isCovered;
 	@Override
 	public void save(List<GoodsExcel> data) {
-		goodsDescService.importUser(data,isCovered);
+		goodsDescService.importGoods(data,isCovered);
 	}
 }

blade-service/blade-client/src/main/java/org/springblade/client/goods/service/impl/GoodsDescServiceImpl.java

@@ -301,6 +301,7 @@ public class GoodsDescServiceImpl extends ServiceImpl<GoodsDescMapper, GoodsDesc
 			goodsDesc.setBrand(e.getBrand());
 			goodsDesc.setBrandItem(e.getBrandItem());
 			goodsDesc.setSpecs(e.getSpecs());
+			goodsDesc.setType(Long.valueOf(e.getType()));
 			goodsDesc.setCategory(e.getCategory());
 			goodsDesc.setCategoryitem(e.getCategoryitem());
 			goodsDesc.setUnit(e.getUnit());