From 59cf24b0aba393e145f4ba3d58e98b7a01a80992 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 14 Feb 2022 14:58:47 +0800
Subject: [PATCH] fix conflict

---
 zq-erp/src/main/java/com/matrix/system/shopXcx/api/vo/SeeAwardTextVo.java |    2 +-
 1 files changed, 1 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 6e12691..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
@@ -51,7 +51,7 @@
 	@ApiModelProperty(value ="客服电话")
 	private String  customerPhone ;
 
-	@ApiModelProperty(value =" 状态(1:待兑换 2:待发货  3:已兑换  )")
+	@ApiModelProperty(value =" 是否已领取（1：待领取2:已领取 3：待配送 4：待收货 5:已失效）")
 	private Integer  state;
 
 	/**

--
Gitblit v1.9.1