From 4dfe83675fc23f4514b6c3cf44fcc84c7e0b52a8 Mon Sep 17 00:00:00 2001 From: jyy <935090232@qq.com> Date: Wed, 21 Apr 2021 10:03:28 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop --- zq-erp/src/main/java/com/matrix/system/shopXcx/api/vo/SignAwardListVo.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/vo/SignAwardListVo.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/vo/SignAwardListVo.java index 1b29b4e..daa0144 100644 --- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/vo/SignAwardListVo.java +++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/vo/SignAwardListVo.java @@ -27,7 +27,7 @@ @ApiModelProperty(value ="数量") private int total; - @ApiModelProperty(value ="是否已领取（1：待领取2:已领取 3：待配送 4：待收货）") + @ApiModelProperty(value ="是否已领取（1：待领取2:已领取 3：待配送 4：待收货 5:已失效）") private Integer state; @ApiModelProperty(value ="领取时间") -- Gitblit v1.9.1