From 5af799118134eb1f77bb310433825fe7cf11e680 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 01 四月 2025 16:57:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0

---
 cloud-server-activity/src/main/java/com/dsh/activity/entity/THuiminCard.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/entity/THuiminCard.java b/cloud-server-activity/src/main/java/com/dsh/activity/entity/THuiminCard.java
index 2111991..10896e4 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/entity/THuiminCard.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/entity/THuiminCard.java
@@ -164,6 +164,12 @@
     @TableField("storeId")
     private Integer storeId;
     /**
+     *运营商id
+     */
+    @ApiModelProperty(value = "运营商id")
+    @TableField("operatorId")
+    private Integer operatorId;
+    /**
      *状态 1已上架 2已下架 3已删除
      */
     @ApiModelProperty(value = "状态 1已上架 2已下架 3已删除 ")

--
Gitblit v1.7.1