From b2a5e4be739b232876b87e65ed70fa5186943d1e Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期三, 09 三月 2022 09:29:35 +0800
Subject: [PATCH] Merge branch 'dev' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into dev
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/McsMerchant.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/McsMerchant.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/McsMerchant.java
index 26e09be..dbeb3db 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/McsMerchant.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/McsMerchant.java
@@ -3,6 +3,8 @@
import java.io.Serializable;
import java.util.Date;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
@@ -35,6 +37,7 @@
/**
* 商家logo
*/
+ @TableField(value = "logo", updateStrategy = FieldStrategy.IGNORED)
private String logo;
/**
* 关联用户id
@@ -52,6 +55,10 @@
* 到期时间
*/
private Date expireAt;
+ /**
+ * 是否暂停服务
+ */
+ private Boolean isPause;
/**
* 首次点亮时间
*/
@@ -71,6 +78,7 @@
/**
* 商家简介
*/
+ @TableField(value = "introduction", updateStrategy = FieldStrategy.IGNORED)
private String introduction;
/**
* 是否删除
--
Gitblit v1.7.1