From 3e7932d378b607f75379b463ae4ae2f4f1ccfe12 Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期三, 18 六月 2025 10:31:30 +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 | 35 ++++++++++++++++++++++++++++++++--- 1 files changed, 32 insertions(+), 3 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..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") @@ -291,11 +296,35 @@ */ @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