From f75496139d661ee4c0550e4e10a86b899371637a Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 29 八月 2025 09:18:52 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0
---
cloud-server-activity/src/main/java/com/dsh/activity/entity/PointsMerchandise.java | 6 ++++++
1 files changed, 6 insertions(+), 0 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 57341a7..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
@@ -175,6 +175,12 @@
// 已兑换数量
@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