From 7e7f901b2172281dc294dfbc67e6ad00625f09f4 Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期一, 04 三月 2024 10:11:21 +0800 Subject: [PATCH] 合并代码 --- 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