From b83a7d0a9249e74ee337cc5ef2a97d1a100e08fe Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 25 七月 2025 20:11:46 +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 | 71 ++++++++++++++++++++++++++++++++---
1 files changed, 64 insertions(+), 7 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 4dadebc..a1d674c 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>
@@ -222,6 +222,11 @@
@TableField("platform_birthday_flag")
private Integer platformBirthdayFlag;
/**
+ * 抽奖1开2关
+ */
+ @TableField("lottery_draw_flag")
+ private Integer lotteryDrawFlag;
+ /**
* 店铺设置状态
*/
@TableField("shop_custom_status")
@@ -269,11 +274,63 @@
@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("dy_poi_id")
+ private String dyPoiId;
+
+ /**
+ * 快手门店id
+ */
+ @TableField("ks_poi_id")
+ private String ksPoiId;
@Override
protected Serializable pkVal() {
return this.shopId;
}
-
+
}
--
Gitblit v1.7.1