From 10324e61220581d7abe7f35555a45e6095617e4d Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期三, 30 七月 2025 10:15:26 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/shop/Shop.java | 43 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 42 insertions(+), 1 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/shop/Shop.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/shop/Shop.java
index 11230b8..db2b1d2 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/shop/Shop.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/shop/Shop.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
@@ -222,6 +223,11 @@
@TableField("platform_birthday_flag")
private Integer platformBirthdayFlag;
/**
+ * 抽奖1开2关
+ */
+ @TableField("lottery_draw_flag")
+ private Integer lotteryDrawFlag;
+ /**
* 店铺设置状态
*/
@TableField("shop_custom_status")
@@ -291,11 +297,46 @@
*/
@TableField("shop_code")
private String shopCode;
+
+ /**
+ * 小鹅通讲师id
+ */
+ @TableField("xiaoe_user_id")
+ private String xiaoeUserId;
+
+ /**
+ * 预约状态（0=关，1=开）
+ */
+ @TableField("subscribe")
+ private Integer subscribe;
+
+ /**
+ * 修改价格权限（0=关，1=开）
+ */
+ @TableField("modify_price_permission")
+ private Integer modifyPricePermission;
+
+ /**
+ * 抖音门店id
+ */
+ @TableField("dy_poi_id")
+ private String dyPoiId;
+ /**
+ * 快手门店id
+ */
+ @TableField("ks_poi_id")
+ private String ksPoiId;
+
+ /**
+ * 该字段用于用户登录获取默认门店
+ */
+ @TableField(exist = false)
+ private Boolean isDefault;
@Override
protected Serializable pkVal() {
return this.shopId;
}
-
+
}
--
Gitblit v1.7.1