From 177249c76aeea0b4bf8d8816d4994e3b445b45ce Mon Sep 17 00:00:00 2001 From: huanghongfa <huanghongfa123456> Date: 星期四, 02 九月 2021 10:39:34 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/zzj' into zzj --- springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventGridMemberRelationDO.java | 31 ++++++++++++++----------------- 1 files changed, 14 insertions(+), 17 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventGridMemberRelationDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventGridMemberRelationDO.java index 57db65c..70af96d 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventGridMemberRelationDO.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventGridMemberRelationDO.java @@ -1,14 +1,11 @@ package com.panzhihua.service_grid.model.dos; -import java.util.*; -import com.baomidou.mybatisplus.annotation.*; -import lombok.Data; - import java.io.Serializable; -import java.math.BigDecimal; import java.util.Date; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; /** * 网格和网格员的关联关系实体类 @@ -17,7 +14,7 @@ * @version 1.0 * @since 1.0 * @date 2021-05-26 - * */ + */ @Data @TableName("event_grid_member_relation") public class EventGridMemberRelationDO implements Serializable { @@ -25,48 +22,48 @@ private static final long serialVersionUID = 1L; /** - * 主键ID 列: id + * 主键ID 列: id */ @TableId(type = IdType.ASSIGN_ID) private Long id; /** - * 网格所属街道 列: grid_street_id + * 网格所属街道 列: grid_street_id */ private Long gridStreetId; /** - * 网格所属社区ID 列: grid_community_id + * 网格所属社区ID 列: grid_community_id */ private Long gridCommunityId; /** - * 网格ID 列: grid_id + * 网格ID 列: grid_id */ private Long gridId; /** - * 网格名称 列: grid_name + * 网格名称 列: grid_name */ private String gridName; /** - * 网格员ID 列: grid_member_id + * 网格员ID 列: grid_member_id */ private Long gridMemberId; /** - * 网格员工作状态 列: work_status + * 网格员工作状态 列: work_status */ private Integer workStatus; /** - * 工作开始时间 列: work_start_at + * 工作开始时间 列: work_start_at */ private Integer workStartAt; /** - * 工作结束时间 列: work_end_at + * 工作结束时间 列: work_end_at */ private Integer workEndAt; /** - * 创建人 列: create_by + * 创建人 列: create_by */ private Long createBy; /** - * 创建时间 列: create_at + * 创建时间 列: create_at */ @TableField(fill = FieldFill.INSERT) private Date createAt; -- Gitblit v1.7.1