From 1b8ad0cc6a79f84fb32fdffae39742afa964748e Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 24 九月 2024 16:09:50 +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/Site.java |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/other/model/Site.java b/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/other/model/Site.java
index 5b2c871..571059d 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/other/model/Site.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/other/model/Site.java
@@ -77,6 +77,7 @@
      * 状态(1=正常,2=冻结,3=删除)
      */
     private Integer state;
+    private Integer operatorId;
     /**
      * 添加时间
      */

--
Gitblit v1.7.1