From 1b9a01bf5000714b08a75a50dd1f5f3eab65d888 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期五, 08 十二月 2023 17:18:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-activity/src/main/java/com/dsh/activity/model/request/PointMercharsVo.java |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/model/request/PointMercharsVo.java b/cloud-server-activity/src/main/java/com/dsh/activity/model/request/PointMercharsVo.java
index 323169b..c7ef156 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/model/request/PointMercharsVo.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/model/request/PointMercharsVo.java
@@ -24,10 +24,6 @@
      */
     Integer quantityIssued;
     /**
-     * 已领数量
-     */
-    Integer quantityHas;
-    /**
      * 限领数量
      */
     Integer pickUpQuantity;
@@ -39,4 +35,6 @@
      * 排序
      */
     Integer sort;
+
+    private Integer num;
 }

--
Gitblit v1.7.1