From 28e8b38e9de8cc76084d0af6a96d2d9d1e1f739f Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 27 十月 2022 13:28:32 +0800
Subject: [PATCH] Merge branch 'local_20221024' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/McsMerchant.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 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 bc666ca..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
@@ -1,10 +1,13 @@
package com.panzhihua.service_community.entity;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
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;
/**
* (McsMerchant)表实体类
@@ -34,6 +37,7 @@
/**
* 商家logo
*/
+ @TableField(value = "logo", updateStrategy = FieldStrategy.IGNORED)
private String logo;
/**
* 关联用户id
@@ -51,6 +55,10 @@
* 到期时间
*/
private Date expireAt;
+ /**
+ * 是否暂停服务
+ */
+ private Boolean isPause;
/**
* 首次点亮时间
*/
@@ -70,6 +78,7 @@
/**
* 商家简介
*/
+ @TableField(value = "introduction", updateStrategy = FieldStrategy.IGNORED)
private String introduction;
/**
* 是否删除
--
Gitblit v1.7.1