From e8f01399a49bb718f184e31d0f6de27c3dc64cef Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 19 八月 2025 08:58:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0

---
 cloud-server-activity/src/main/java/com/dsh/activity/feignclient/other/model/Store.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/other/model/Store.java b/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/other/model/Store.java
index 1400569..5bae959 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/other/model/Store.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/other/model/Store.java
@@ -106,4 +106,11 @@
      */
     private Integer state;
 
+    @TableField("operatorId")
+    private Integer operatorId;
+
+    @TableField(exist = false)
+    private String oName;
+
+    private String ids;
 }

--
Gitblit v1.7.1