| @@ -22,43 +22,43 @@ public class WxVtwoActivityPrizeDrawMainData implements Serializable { | |||||
| private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
| @Excel(name="客户姓名",width = 20,orderNum = "1") | |||||
| @Excel(name="客户姓名",width = 20,orderNum = "1",needMerge=true) | |||||
| private String cusName; | private String cusName; | ||||
| @Excel(name="客户电话",width = 20,orderNum = "2") | |||||
| @Excel(name="客户电话",width = 20,orderNum = "2",needMerge=true) | |||||
| private String cusPhone; | private String cusPhone; | ||||
| @Excel(name="订单数量",width = 20,orderNum = "3") | |||||
| @Excel(name="订单数量",width = 20,orderNum = "3",needMerge=true) | |||||
| private Integer orderCount; | private Integer orderCount; | ||||
| @Excel(name="订单总金额",width = 20,orderNum = "4") | |||||
| @Excel(name="订单总金额",width = 20,orderNum = "4",needMerge=true) | |||||
| private BigDecimal orderMoneySum; | private BigDecimal orderMoneySum; | ||||
| @Excel(name="领奖人",width = 20,orderNum = "5") | |||||
| @Excel(name="领奖人",width = 20,orderNum = "5",needMerge=true) | |||||
| private String realName; | private String realName; | ||||
| @Excel(name="领奖人身份证号",width = 20,orderNum = "6") | |||||
| @Excel(name="领奖人身份证号",width = 20,orderNum = "6",needMerge=true) | |||||
| private String realCard; | private String realCard; | ||||
| @Excel(name="发奖人",width = 20,orderNum = "7") | |||||
| @Excel(name="发奖人",width = 20,orderNum = "7",needMerge=true) | |||||
| private String grantByName; | private String grantByName; | ||||
| @Excel(name="发奖时间",width = 20,orderNum = "8") | |||||
| @Excel(name="发奖时间",format = "yyyy-MM-dd HH:mm:ss",width = 20,orderNum = "8",needMerge=true) | |||||
| private Date grantTime; | private Date grantTime; | ||||
| @Excel(name="抽奖券编码",width = 20,orderNum = "9") | |||||
| @Excel(name="抽奖券编码",width = 20,orderNum = "9",needMerge=true) | |||||
| private String lotteryNum; | private String lotteryNum; | ||||
| @Excel(name="抽奖券数量",width = 20,orderNum = "10") | |||||
| @Excel(name="抽奖券数量",width = 20,orderNum = "10",needMerge=true) | |||||
| private Integer lotteryCount; | private Integer lotteryCount; | ||||
| @Excel(name="周年庆抽奖编码",width = 20,orderNum = "11") | |||||
| @Excel(name="周年庆抽奖编码",width = 20,orderNum = "11",needMerge=true) | |||||
| private String anniversaryLotteryNum; | private String anniversaryLotteryNum; | ||||
| @Excel(name="签名图片",width = 20,orderNum = "12") | |||||
| @Excel(name="签名图片",width = 20,orderNum = "12",needMerge=true) | |||||
| private String signImg; | private String signImg; | ||||
| @Excel(name="发奖备注",width = 20,orderNum = "13") | |||||
| @Excel(name="发奖备注",width = 20,orderNum = "13",needMerge=true) | |||||
| private String remark; | private String remark; | ||||
| //发奖明细 | //发奖明细 | ||||
| @@ -66,7 +66,7 @@ public class WxVtwoActivityPrizeDrawMainData implements Serializable { | |||||
| //联单发奖 | //联单发奖 | ||||
| private String jointGrantDetail; | private String jointGrantDetail; | ||||
| @ExcelCollection(name="订单列表") | |||||
| @ExcelCollection(name="订单列表",orderNum = "14") | |||||
| private List<WxVtwoActivityPrizeDrawOrderData> orderList; | private List<WxVtwoActivityPrizeDrawOrderData> orderList; | ||||
| public void initByWxVtwoActivityGrantExportTwo(WxVtwoActivityGrantExportTwo aget) { | public void initByWxVtwoActivityGrantExportTwo(WxVtwoActivityGrantExportTwo aget) { | ||||