| @@ -50,32 +50,33 @@ public class WxCashBackActivityRecord extends TenantEntity { | |||||
| private String phone; | private String phone; | ||||
| @Excel(name="客户地址",width = 20,orderNum = "8") | @Excel(name="客户地址",width = 20,orderNum = "8") | ||||
| @io.swagger.annotations.ApiModelProperty(value = "客户地址", name = "address") | @io.swagger.annotations.ApiModelProperty(value = "客户地址", name = "address") | ||||
| private String address; | |||||
| private String address; | |||||
| @Excel(name="状态",width = 20,replace = {"审核中_0", "审核通过_1", "审核驳回_2"},orderNum = "9") | |||||
| @io.swagger.annotations.ApiModelProperty(value = "EnumCashBackActivityRecordStatus", name = "auditStatus") | @io.swagger.annotations.ApiModelProperty(value = "EnumCashBackActivityRecordStatus", name = "auditStatus") | ||||
| private Integer auditStatus; | private Integer auditStatus; | ||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private List<Integer> auditStatusList; | private List<Integer> auditStatusList; | ||||
| @io.swagger.annotations.ApiModelProperty(value = "审核内容", name = "auditRemark") | @io.swagger.annotations.ApiModelProperty(value = "审核内容", name = "auditRemark") | ||||
| private String auditRemark; | private String auditRemark; | ||||
| @Excel(name="返现比例(%)",width = 20,orderNum = "9") | |||||
| @Excel(name="返现比例(%)",width = 20,orderNum = "10") | |||||
| @io.swagger.annotations.ApiModelProperty(value = "返现比率", name = "cashRate") | @io.swagger.annotations.ApiModelProperty(value = "返现比率", name = "cashRate") | ||||
| private BigDecimal cashRate; | private BigDecimal cashRate; | ||||
| @Excel(name="返现金额",width = 20,orderNum = "10") | |||||
| @Excel(name="返现金额",width = 20,orderNum = "11") | |||||
| @io.swagger.annotations.ApiModelProperty(value = "返现金额", name = "cashMoney") | @io.swagger.annotations.ApiModelProperty(value = "返现金额", name = "cashMoney") | ||||
| private BigDecimal cashMoney; | private BigDecimal cashMoney; | ||||
| @Excel(name="商管承担比例(%)",width = 20,orderNum = "11") | |||||
| @Excel(name="商管承担比例(%)",width = 20,orderNum = "12") | |||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private BigDecimal mallRate; | private BigDecimal mallRate; | ||||
| @Excel(name="商管承担返现金额",width = 20,orderNum = "12") | |||||
| @Excel(name="商管承担返现金额",width = 20,orderNum = "13") | |||||
| @io.swagger.annotations.ApiModelProperty(value = "商管承担返现金额", name = "mallCashMoney") | @io.swagger.annotations.ApiModelProperty(value = "商管承担返现金额", name = "mallCashMoney") | ||||
| private BigDecimal mallCashMoney; | private BigDecimal mallCashMoney; | ||||
| @Excel(name="商户承担比例(%)",width = 20,orderNum = "13") | |||||
| @Excel(name="商户承担比例(%)",width = 20,orderNum = "14") | |||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private BigDecimal merchantRate; | private BigDecimal merchantRate; | ||||
| @Excel(name="商户承担返现金额",width = 20,orderNum = "14") | |||||
| @Excel(name="商户承担返现金额",width = 20,orderNum = "15") | |||||
| @io.swagger.annotations.ApiModelProperty(value = "商户承担返现金额", name = "merchantCashMoney") | @io.swagger.annotations.ApiModelProperty(value = "商户承担返现金额", name = "merchantCashMoney") | ||||
| private BigDecimal merchantCashMoney; | private BigDecimal merchantCashMoney; | ||||
| @Excel(name="提交时间",width = 20,format="yyyy-MM-dd HH:mm:ss", orderNum = "15") | |||||
| @Excel(name="提交时间",width = 20,format="yyyy-MM-dd HH:mm:ss", orderNum = "16") | |||||
| @io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "createDate") | @io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "createDate") | ||||
| private Date createDate; | private Date createDate; | ||||
| @TableField(exist = false) | @TableField(exist = false) | ||||