Просмотр исходного кода

Merge branch 'release_toaliyun_real_20230323' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_20230323

release_toaliyun_real
xhxu 3 лет назад
Родитель
Сommit
9210e20c5a
1 измененных файлов: 11 добавлений и 11 удалений
  1. +11
    -11
      mallinkService/src/main/java/com/iformall/domain/vo/WxCouponPasswordVo.java

+ 11
- 11
mallinkService/src/main/java/com/iformall/domain/vo/WxCouponPasswordVo.java Просмотреть файл

@@ -25,45 +25,45 @@ public class WxCouponPasswordVo extends TenantEntity {


@Excel(name = "卡号", width = 20, orderNum = "1", prefix = "`") @Excel(name = "卡号", width = 20, orderNum = "1", prefix = "`")
protected Long id; protected Long id;
@Excel(name = "卡名称", width = 20, orderNum = "2", prefix = "`")
@Excel(name = "卡名称", width = 20, orderNum = "2", prefix = "")
protected String couponTitile; protected String couponTitile;
@Excel(name = "卡密", width = 20, orderNum = "3", prefix = "`")
@Excel(name = "卡密", width = 20, orderNum = "3", prefix = "")
@io.swagger.annotations.ApiModelProperty(value = "卡密", name = "couponPassword") @io.swagger.annotations.ApiModelProperty(value = "卡密", name = "couponPassword")
private String couponPassword; private String couponPassword;
@Excel(name = "卡密面额(分)", width = 20, orderNum = "4", prefix = "`")
@Excel(name = "卡密面额(分)", width = 20, orderNum = "4")
@io.swagger.annotations.ApiModelProperty(value = "卡密面额", name = "couponPasswordPrice") @io.swagger.annotations.ApiModelProperty(value = "卡密面额", name = "couponPasswordPrice")
private Integer couponPasswordPrice; private Integer couponPasswordPrice;
@Excel(name = "创建时间", width = 20, exportFormat = "yyyy-MM-dd HH:mm:ss", orderNum = "5") @Excel(name = "创建时间", width = 20, exportFormat = "yyyy-MM-dd HH:mm:ss", orderNum = "5")
@io.swagger.annotations.ApiModelProperty(value = "", name = "createDate") @io.swagger.annotations.ApiModelProperty(value = "", name = "createDate")
private Date createDate; private Date createDate;
@Excel(name = "卡密状态", width = 20, orderNum = "6", replace = {"初始化_0", "消息发送中_1", "消息已发送_2", "已兑换_3","已作废_4"},prefix = "`")
@Excel(name = "卡密状态", width = 20, orderNum = "6", replace = {"初始化_0", "消息发送中_1", "消息已发送_2", "已兑换_3","已作废_4"},prefix = "")
@io.swagger.annotations.ApiModelProperty(value = "卡密状态", name = "remainPrice") @io.swagger.annotations.ApiModelProperty(value = "卡密状态", name = "remainPrice")
private Integer status; private Integer status;
@Excel(name = "卡密是否停用", width = 20, orderNum = "7", replace = {"否_0", "是_1"},prefix = "`")
@Excel(name = "卡密是否停用", width = 20, orderNum = "7", replace = {"否_0", "是_1"},prefix = "")
@io.swagger.annotations.ApiModelProperty(value = "卡密是否停用", name = "isStop") @io.swagger.annotations.ApiModelProperty(value = "卡密是否停用", name = "isStop")
private Integer isStop; private Integer isStop;
@Excel(name = "卡激活状态", width = 20, orderNum = "8",replace = {"未激活_0", "已激活_1"}, prefix = "`")
@Excel(name = "卡激活状态", width = 20, orderNum = "8",replace = {"未激活_0", "已激活_1"}, prefix = "")
@io.swagger.annotations.ApiModelProperty(value = "卡激活状态EnumYesOrNo", name = "used") @io.swagger.annotations.ApiModelProperty(value = "卡激活状态EnumYesOrNo", name = "used")
private Integer used; private Integer used;
@Excel(name = "激活时间", width = 20, exportFormat = "yyyy-MM-dd HH:mm:ss", orderNum = "9") @Excel(name = "激活时间", width = 20, exportFormat = "yyyy-MM-dd HH:mm:ss", orderNum = "9")
@io.swagger.annotations.ApiModelProperty(value = "", name = "activeDate") @io.swagger.annotations.ApiModelProperty(value = "", name = "activeDate")
private Date activeDate; private Date activeDate;
@Excel(name = "激活手机号", width = 20, orderNum = "10", prefix = "`")
@Excel(name = "激活手机号", width = 20, orderNum = "10", prefix = "")
@io.swagger.annotations.ApiModelProperty(value = "激活手机号", name = "phone") @io.swagger.annotations.ApiModelProperty(value = "激活手机号", name = "phone")
private String phone; private String phone;
@Excel(name = "激活会员", width = 20, orderNum = "11", prefix = "`")
@Excel(name = "激活会员", width = 20, orderNum = "11", prefix = "")
@io.swagger.annotations.ApiModelProperty(value = "激活会员", name = "userName") @io.swagger.annotations.ApiModelProperty(value = "激活会员", name = "userName")
private String userName; private String userName;
@Excel(name = "电子卡卡号", width = 20, orderNum = "12", prefix = "`") @Excel(name = "电子卡卡号", width = 20, orderNum = "12", prefix = "`")
@io.swagger.annotations.ApiModelProperty(value = "电子卡卡号", name = "cardId") @io.swagger.annotations.ApiModelProperty(value = "电子卡卡号", name = "cardId")
private Long cardId; private Long cardId;
@Excel(name = "面额(元)", width = 20, orderNum = "13", prefix = "`")
@Excel(name = "面额(元)", width = 20, orderNum = "13")
@io.swagger.annotations.ApiModelProperty(value = "面额(元)", name = "price") @io.swagger.annotations.ApiModelProperty(value = "面额(元)", name = "price")
private Double price; private Double price;
@Excel(name = "余额(元)", width = 20, orderNum = "14", prefix = "`")
@Excel(name = "余额(元)", width = 20, orderNum = "14")
@io.swagger.annotations.ApiModelProperty(value = "余额(元)", name = "remainPrice") @io.swagger.annotations.ApiModelProperty(value = "余额(元)", name = "remainPrice")
private Double remainPrice; private Double remainPrice;
@Excel(name = "电子卡状态", width = 20, orderNum = "15",replace = {"正常_0", "已禁用_1"}, prefix = "`")
@Excel(name = "电子卡状态", width = 20, orderNum = "15",replace = {"正常_0", "已禁用_1"}, prefix = "")
@io.swagger.annotations.ApiModelProperty(value = "电子卡状态EnumYesOrNo", name = "cardStatus") @io.swagger.annotations.ApiModelProperty(value = "电子卡状态EnumYesOrNo", name = "cardStatus")
private Integer cardStatus; private Integer cardStatus;




Загрузка…
Отмена
Сохранить