From dd99da83d2708dc1fdb84f9fa71b5e63d5579338 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 10 十一月 2022 17:37:08 +0800
Subject: [PATCH] Merge branch 'local_20221104' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ConvenientMerchantDO.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ConvenientMerchantDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ConvenientMerchantDO.java
index 9529ba3..9be93f5 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ConvenientMerchantDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ConvenientMerchantDO.java
@@ -1,13 +1,10 @@
package com.panzhihua.service_community.model.dos;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+
import java.io.Serializable;
import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import lombok.Data;
/**
* @title: ConvenientMerchantDO
@@ -106,7 +103,9 @@
/**
* 创建时间
*/
+ @TableField(fill = FieldFill.INSERT)
private Date createdAt;
+
/**
* 创建人
*/
@@ -114,6 +113,7 @@
/**
* 更新时间
*/
+ @TableField(fill = FieldFill.UPDATE)
private Date updatedAt;
/**
* 更新人
@@ -121,4 +121,9 @@
private Long updatedBy;
private String areaCode;
+
+ /**
+ * 服务范围
+ */
+ private Integer serviceRange;
}
--
Gitblit v1.7.1