From 8064549857d1cbfc9e7b80024f666a3b006ed3e0 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 28 三月 2025 21:37:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/PointsMerchandise.java | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/PointsMerchandise.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/PointsMerchandise.java
index fe72114..d52e25e 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/PointsMerchandise.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/PointsMerchandise.java
@@ -163,7 +163,23 @@
*/
@TableField("shelves")
private Integer shelves;
+ @TableField("cardType")
+ private Integer cardType;
+ @TableField("status")
+ private Integer status;
+ // 已领数量
+ @TableField(exist = false)
+ private Integer pickUpQuantity3;
+ // 已兑换数量
+ @TableField(exist = false)
+ private Integer pickUpQuantity4;
+ @TableField("addUserId")
+ // 添加人id 判断是平台添加还是运营商添加 用于判断分账
+ private Integer addUserId;
+ @TableField("addType")
+ // 添加人类型 1平台2运营商3门店 用于判断分账
+ private Integer addType;
@Override
protected Serializable pkVal() {
return this.id;
--
Gitblit v1.7.1