Merge branch 'master-tiande' into dev-tiande

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderActivityInfoDetailBiz.java

@@ -192,7 +192,7 @@ public class OrderActivityInfoDetailBiz extends BaseBiz<OrderActivityDetailMappe
         for(int i=0;i<header3.length;i++){
             sheet.setColumnWidth(i,24*256);
         }
-        List<String[]> orderDataList = getMemberOrderDataList(memberOrderBoList, 10);
+        List<String[]> orderDataList = getMemberOrderDataList(memberOrderBoList, 11);
         orderMemberService.createMemberOrderCellData(sheet,5,generalCellStyle,orderDataList);
         hssfWorkbook.write(outputStream);
         hssfWorkbook.close();