From 07fb617c686699435cde29e8147f11a125d7d618 Mon Sep 17 00:00:00 2001 From: huliguo <2023611923@qq.com> Date: 星期一, 23 六月 2025 11:10:12 +0800 Subject: [PATCH] bug修改 --- ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/shop/Shop.java | 80 ++++++++++++++++++++++++++++++++++++---- 1 files changed, 72 insertions(+), 8 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 bdb3976..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 @@ -1,16 +1,16 @@ package com.ruoyi.system.api.domain.poji.shop; -import com.baomidou.mybatisplus.annotation.IdType; -import java.util.Date; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.util.Date; /** * <p> @@ -39,7 +39,7 @@ @TableField("del_flag") private Integer delFlag; /** - * 商户状态-1删除0冻结1正常2终止合作 + * 商户状态-1删除0冻结1正常2合作终止3进件中 */ @TableField("shop_status") private Integer shopStatus; @@ -222,6 +222,11 @@ @TableField("platform_birthday_flag") private Integer platformBirthdayFlag; /** + * 抽奖1开2关 + */ + @TableField("lottery_draw_flag") + private Integer lotteryDrawFlag; + /** * 店铺设置状态 */ @TableField("shop_custom_status") @@ -257,10 +262,69 @@ @TableField("shop_source") private String shopSource; + /** + * 冻结标记 + */ + @TableField("frozen_flag") + private Integer frozenFlag; + /** + * 合作标记 + */ + @TableField("cooperative_flag") + private Integer cooperativeFlag; + + /** + * 扩展联系人 + */ + @TableField("extend_contacts") + private String extendContacts; + + /** + * 进件标记 + */ + @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