From 331ae50b1cdcb31a4a0c182abb82aec5c1b12f83 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期三, 15 十一月 2023 09:40:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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