From 7d22ca5a1c9416e84430a3997664e17861a2951e Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 11 四月 2025 21:04:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-activity/src/main/java/com/dsh/activity/entity/PointsMerchandise.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/entity/PointsMerchandise.java b/cloud-server-activity/src/main/java/com/dsh/activity/entity/PointsMerchandise.java
index 4fa8b3b..3d7cd93 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/entity/PointsMerchandise.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/entity/PointsMerchandise.java
@@ -169,7 +169,18 @@
private Integer status;
@TableField("remark")
private String remark;
-
+ // 已领数量
+ @TableField(exist = false)
+ private Integer pickUpQuantity3;
+ // 已兑换数量
+ @TableField(exist = false)
+ private Integer pickUpQuantity4;
+ // 添加人id 判断是平台添加还是运营商添加 用于判断分账
+ @TableField("addUserId")
+ private Integer addUserId;
+ // 添加人类型 1平台2运营商3门店 用于判断分账
+ @TableField("addType")
+ private Integer addType;
@Override
protected Serializable pkVal() {
return this.id;
--
Gitblit v1.7.1