From 938d37e96dc00f8fc3c7036d818e87d51624e0a9 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 14 Mar 2022 15:34:01 +0800
Subject: [PATCH] Merge branch 'developer' into alpha

---
 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 b445647..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:已领取）")
+	@ApiModelProperty(value ="是否已领取（1：待领取2:已领取 3：待配送 4：待收货 5:已失效）")
 	private Integer  state;
 	
 	@ApiModelProperty(value ="领取时间")

--
Gitblit v1.9.1