| @@ -22,58 +22,58 @@ public class WxVtwoActivityPrizeDrawOrderData implements Serializable { | |||||
| private Long id; | private Long id; | ||||
| @Excel(name="订单编号",width = 20,orderNum = "1") | |||||
| @Excel(name="订单编号",width = 20,orderNum = "1",needMerge=true) | |||||
| private String orderNo; | private String orderNo; | ||||
| @Excel(name="订单金额",width = 20,orderNum = "2") | |||||
| @Excel(name="订单金额",width = 20,orderNum = "2",needMerge=true) | |||||
| private BigDecimal orderMoney; | private BigDecimal orderMoney; | ||||
| @Excel(name="客户姓名",width = 20,orderNum = "3") | |||||
| @Excel(name="客户姓名",width = 20,orderNum = "3",needMerge=true) | |||||
| private String cusName; | private String cusName; | ||||
| @Excel(name="客户电话",width = 20,orderNum = "4") | |||||
| @Excel(name="客户电话",width = 20,orderNum = "4",needMerge=true) | |||||
| private String cusPhone; | private String cusPhone; | ||||
| @Excel(name="vip卡",width = 20,orderNum = "5") | |||||
| @Excel(name="vip卡",width = 20,orderNum = "5",needMerge=true) | |||||
| private String vipNum; | private String vipNum; | ||||
| @Excel(name="所属军团",width = 20,orderNum = "6") | |||||
| @Excel(name="所属军团",width = 20,orderNum = "6",needMerge=true) | |||||
| private String legionName; | private String legionName; | ||||
| @Excel(name="所属联盟",width = 20,orderNum = "7") | |||||
| @Excel(name="所属联盟",width = 20,orderNum = "7",needMerge=true) | |||||
| private String unionName; | private String unionName; | ||||
| @Excel(name="订单地址",width = 20,orderNum = "8") | |||||
| @Excel(name="订单地址",width = 20,orderNum = "8",needMerge=true) | |||||
| private String cusAddress; | private String cusAddress; | ||||
| @Excel(name="商户名称",width = 20,orderNum = "9") | |||||
| @Excel(name="商户名称",width = 20,orderNum = "9",needMerge=true) | |||||
| private String merchantName; | private String merchantName; | ||||
| @Excel(name="铺位号",width = 20,orderNum = "10") | |||||
| @Excel(name="铺位号",width = 20,orderNum = "10",needMerge=true) | |||||
| private String shopNumber; | private String shopNumber; | ||||
| @Excel(name="业态",width = 20,orderNum = "11") | |||||
| @Excel(name="业态",width = 20,orderNum = "11",needMerge=true) | |||||
| private String businessName; | private String businessName; | ||||
| @Excel(name="抽奖券编码",width = 20,orderNum = "12") | |||||
| @Excel(name="抽奖券编码",width = 20,orderNum = "12",needMerge=true) | |||||
| private String lotteryNum; | private String lotteryNum; | ||||
| @Excel(name="抽奖券数量",width = 20,orderNum = "13") | |||||
| @Excel(name="抽奖券数量",width = 20,orderNum = "13",needMerge=true) | |||||
| private Integer lotteryCount; | private Integer lotteryCount; | ||||
| @Excel(name="周年庆抽奖编码",width = 20,orderNum = "14") | |||||
| @Excel(name="周年庆抽奖编码",width = 20,orderNum = "14",needMerge=true) | |||||
| private String anniversaryLotteryNum; | private String anniversaryLotteryNum; | ||||
| @Excel(name="提交时间",format = "yyyy-MM-dd HH:mm:ss",width = 20,orderNum = "15") | |||||
| @Excel(name="提交时间",format = "yyyy-MM-dd HH:mm:ss",width = 20,orderNum = "15",needMerge=true) | |||||
| private Date createDate; | private Date createDate; | ||||
| @Excel(name="订单状态",width = 20,orderNum = "16", replace = {"审核中_0", "已审批_1", "已驳回_2", "已退单_3", "已发奖_10"}) | |||||
| @Excel(name="订单状态",width = 20,orderNum = "16", replace = {"审核中_0", "已审批_1", "已驳回_2", "已退单_3", "已发奖_10"},needMerge=true) | |||||
| private Integer auditStatus; | private Integer auditStatus; | ||||
| @Excel(name="审核人",width = 20,orderNum = "17") | |||||
| @Excel(name="审核人",width = 20,orderNum = "17",needMerge=true) | |||||
| private String auditByName; | private String auditByName; | ||||
| @Excel(name="审核时间",format = "yyyy-MM-dd HH:mm:ss", width = 20,orderNum = "18") | |||||
| @Excel(name="审核时间",format = "yyyy-MM-dd HH:mm:ss", width = 20,orderNum = "18",needMerge=true) | |||||
| private Date auditTime; | private Date auditTime; | ||||
| @ExcelCollection(name="发奖列表",orderNum = "19") | @ExcelCollection(name="发奖列表",orderNum = "19") | ||||