From 6d78f8ab222498d727e91983d0511d8119d95aa3 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Mon, 24 Jan 2022 19:34:42 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger
---
zq-erp/src/main/java/com/matrix/system/hive/action/ShoppingGoodsController.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/action/ShoppingGoodsController.java b/zq-erp/src/main/java/com/matrix/system/hive/action/ShoppingGoodsController.java
index 5fe5d27..106ecd6 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/action/ShoppingGoodsController.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/action/ShoppingGoodsController.java
@@ -435,7 +435,7 @@
String title = "商品资料";
orderSheet.setSheetName(title);
orderSheet.setTitle(title);
- String[] header = {"商品名称", "商品编号", "售价/(本金)", "参考价/(赠送金额)", "真实销量", "状态", "是否赠送", "类型", "分类", "是否固定套餐", "产品归属"};
+ String[] header = {"商品名称", "商品编号", "售价/(本金)", "参考价/(赠送金额)", "真实销量", "状态", "是否赠送", "类型", "分类", "是否固定套餐", "产品归属","时长"};
orderSheet.setHeaders(header);
List<ShoppingGoods> dataList = shoppingGoodsService.findAll(shoppingGoods);
List<List<Object>> list = new ArrayList<>();
@@ -453,6 +453,7 @@
temp.add(item.getCateName());
temp.add(item.getIsCourse());
temp.add(item.getHeadquarters() == 1 ? "总部产品" : "本店产品");
+ temp.add(item.getTimeLength());
list.add(temp);
}
}
--
Gitblit v1.9.1