From 334fbd5f1a5a4e85c198560bd024211ba4cf99b1 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 11 三月 2024 18:27:27 +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 | 1 +
1 files changed, 1 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..6b30671 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,7 @@
// 已兑换数量
@TableField(exist = false)
private Integer pickUpQuantity4;
+
@Override
protected Serializable pkVal() {
return this.id;
--
Gitblit v1.7.1