|
|
@@ -467,10 +467,10 @@ public class ExportController extends BaseController {
|
|
|
OutputStream outputStream = response.getOutputStream();
|
|
|
try {
|
|
|
HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"商品编号", "货号", "品牌", "商品名称",
|
|
|
- "是否组合商品", "是否库存预警","商品类型", "商品分类", "具体型号", "内部库存", "税务库存", "库存类型", "市场价(元)",
|
|
|
+ "是否组合商品", "商品类型", "商品分类", "具体型号", "内部库存", "税务库存", "库存类型", "市场价(元)",
|
|
|
"零售价(元)", "商品团购价(元)", "商品描述", "商品详情", "是否上下架"}, new String[]{
|
|
|
"id", "sn", "brand", "name",
|
|
|
- "complementGoodsIdList == null || complementGoodsIdList == '' ? '否':'是'", "stockWarning.msg",
|
|
|
+ "complementGoodsIdList == null || complementGoodsIdList == '' ? '否':'是'",
|
|
|
"type.desc", "goodsCategoryName", "specification", "stockCount", "taxStockCount", "stockType.msg", "marketPrice",
|
|
|
"discountPrice", "groupPurchasePrice", "brief", "desc", "status.msg"}, rows);
|
|
|
response.setContentType("application/octet-stream");
|
yanite