From 1730a7fc4bb96f258d9dc8dec2e629cadbfdefc0 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 18 六月 2025 13:47:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' 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 a8ead45..db4e83d 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
@@ -222,6 +222,11 @@
@TableField("platform_birthday_flag")
private Integer platformBirthdayFlag;
/**
+ * 抽奖1开2关
+ */
+ @TableField("lottery_draw_flag")
+ private Integer lotteryDrawFlag;
+ /**
* 店铺设置状态
*/
@TableField("shop_custom_status")
@@ -281,9 +286,45 @@
@TableField("auth_flag")
private Integer authFlag;
+ /**
+ * 分账标记
+ */
+ @TableField("account_flag")
+ private Integer accountFlag;
+ /**
+ * 店铺二维码
+ */
+ @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("poi_id")
+ private String poiId;
+
+
@Override
protected Serializable pkVal() {
return this.shopId;
}
-
+
}
--
Gitblit v1.7.1