From 3f7a3aefe2965459aed169383b285fba400cfe8c Mon Sep 17 00:00:00 2001
From: jiangqs <343695869@qq.com>
Date: 星期日, 04 六月 2023 13:13:54 +0800
Subject: [PATCH] Merge branch 'master' of http://sinata.cn:10101/gitblit/r/java/HongRuiTang
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/shop/Shop.java | 15 ++++++++++++++-
1 files changed, 14 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 bdb3976..4dadebc 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
@@ -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,19 @@
@TableField("shop_source")
private String shopSource;
+ /**
+ * 冻结标记
+ */
+ @TableField("frozen_flag")
+ private Integer frozenFlag;
+
+ /**
+ * 合作标记
+ */
+ @TableField("cooperative_flag")
+ private Integer cooperativeFlag;
+
+
@Override
protected Serializable pkVal() {
--
Gitblit v1.7.1