From b23b243473fc9ab20ca62eebf3668c143e2e7d23 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 24 七月 2024 15:30:53 +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/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