From 0b956579c125f41f27d1e09ecae5853926ef19fe Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 18 三月 2024 15:48:57 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/shop/Shop.java | 49 ++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 42 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 bdb3976..11230b8 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;
@@ -257,6 +257,41 @@
@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;
+
@Override
protected Serializable pkVal() {
--
Gitblit v1.7.1