From 3530f728388d91b09a62fbd8f82d3a56b1ff265b Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 25 十月 2023 10:36:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/PointMercharsVo.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/PointMercharsVo.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/PointMercharsVo.java
index 8e3e984..0e2e4bd 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/PointMercharsVo.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/PointMercharsVo.java
@@ -24,10 +24,6 @@
*/
Integer quantityIssued;
/**
- * 已领数量
- */
- Integer quantityHas;
- /**
* 限领数量
*/
Integer pickUpQuantity;
@@ -39,4 +35,8 @@
* 排序
*/
Integer sort;
+ /**
+ * 已换数量
+ */
+ private Integer num;
}
--
Gitblit v1.7.1