| 
					
				 | 
			
			
				@@ -217,11 +217,13 @@ 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 == '' ? '否':'是'", "clientShow.msg", "educationalShow.msg", "musicGroupShow.msg","replacementShow.msg", "stockWarning.msg", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    "complementGoodsIdList == null || complementGoodsIdList == '' ? '否':'是'", "clientShow.msg", "educationalShow.msg", "musicGroupShow.msg", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    "courseViewType == null?'':courseViewType == '0'?'系统收费':courseViewType == '0,1'?'系统收费\\课程收费':courseViewType == '0,2'?'系统收费\\\\云教练收费':courseViewType == '1,2'?'课程收费\\云教练收费':courseViewType == '0,1,2'?'系统收费\\课程收费\\云教练收费':''", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    "replacementShow.msg", "stockWarning.msg", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     "type.desc", "goodsCategoryName", "specification", "stockCount", "taxStockCount", "stockType.msg", "marketPrice", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     "discountPrice", "groupPurchasePrice", "brief", "desc", "status.msg"}, rows); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             response.setContentType("application/octet-stream"); 
			 |