From 08f1b1f1804a8bd833d42f257908d80e88387b55 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 14 三月 2025 11:27:47 +0800
Subject: [PATCH] 3.5增加登录验证、修改密码、人员列表调整
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ConvenientMerchantDO.java | 44 ++++++++++++++++++++++++++++++++++++--------
1 files changed, 36 insertions(+), 8 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 048a2e5..67b0292 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,11 @@
package com.panzhihua.service_community.model.dos;
-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 com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
/**
* @title: ConvenientMerchantDO
@@ -25,7 +23,7 @@
/**
* 主键id
*/
- @TableId(type = IdType.AUTO)
+ @TableId(type = IdType.ASSIGN_ID)
private Long id;
/**
* 商家名称
@@ -59,6 +57,11 @@
* 商家地址
*/
private String address;
+
+ /**
+ * 详细地址
+ */
+ private String detailedAddress;
/**
* 纬度
*/
@@ -106,7 +109,9 @@
/**
* 创建时间
*/
+ @TableField(fill = FieldFill.INSERT)
private Date createdAt;
+
/**
* 创建人
*/
@@ -114,9 +119,32 @@
/**
* 更新时间
*/
+ @TableField(fill = FieldFill.UPDATE)
private Date updatedAt;
/**
* 更新人
*/
private Long updatedBy;
+
+ private String areaCode;
+
+ /**
+ * 服务范围
+ */
+ private Integer serviceRange;
+
+ /**
+ * 手机号
+ */
+ private String mobilePhone;
+
+ /**
+ * 店铺销量
+ */
+ private Integer sale;
+
+ /**
+ * 店铺销售额
+ */
+ private BigDecimal saleVolume;
}
--
Gitblit v1.7.1