From dd6cab3f295e2e9f127313c1ea3dde09eccb2ce6 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Fri, 11 Jun 2021 21:57:50 +0800 Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop --- zq-erp/src/main/java/com/matrix/system/shopXcx/api/vo/SeeAwardTextVo.java | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/vo/SeeAwardTextVo.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/vo/SeeAwardTextVo.java index 5e00550..c5733d6 100644 --- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/vo/SeeAwardTextVo.java +++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/vo/SeeAwardTextVo.java @@ -48,7 +48,10 @@ @ApiModelProperty(value ="客服微信") private String wechatImg; - @ApiModelProperty(value =" 状态(1:待兑换 2:待发货 3:已兑换 )") + @ApiModelProperty(value ="客服电话") + private String customerPhone ; + + @ApiModelProperty(value =" 是否已领取（1：待领取2:已领取 3：待配送 4：待收货 5:已失效）") private Integer state; /** -- Gitblit v1.9.1