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/PointsMerchandiseStore.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/entity/PointsMerchandiseStore.java b/cloud-server-activity/src/main/java/com/dsh/activity/entity/PointsMerchandiseStore.java
index 85ed35d..3efebb7 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/entity/PointsMerchandiseStore.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/entity/PointsMerchandiseStore.java
@@ -37,6 +37,8 @@
*/
@TableField("pointsMerchandiseId")
private Integer pointsMerchandiseId;
+ @TableField("siteId")
+ private Integer siteId;
/**
* 门店id
*/
--
Gitblit v1.7.1