From 609d91e1e62b1e8932b34b15b09baf02e7f09a93 Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期一, 09 十二月 2024 10:36:47 +0800 Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng --- ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Region.java | 53 +++++++++++++++++------------------------------------ 1 files changed, 17 insertions(+), 36 deletions(-) diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Region.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Region.java index c395dd9..bbaa873 100644 --- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Region.java +++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Region.java @@ -1,50 +1,31 @@ package com.ruoyi.other.api.domain; import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import lombok.Data; import lombok.EqualsAndHashCode; -/** - * @author zhibing.pu - * @Date 2024/8/8 11:55 - */ +import java.io.Serializable; + @Data @EqualsAndHashCode(callSuper = false) @TableName("t_region") @ApiModel(value="Region对象", description="") -public class Region { - /** - * 主键 - */ - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - /** - * 城市名称 - */ - @TableField("name") - private String name; - /** - * 行政区划代码 - */ - @TableField("code") - private String code; - /** - * 城市code - */ - @TableField("citycode") - private String citycode; - /** - * 父级ID - */ - @TableField("parent_id") - private Integer parentId; - /** - * 英文名称 - */ - @TableField("english") - private String english; +public class Region implements Serializable { + private static final long serialVersionUID = 1L; + + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + private String name; + + private String code; + + private String citycode; + + private Long parentId; + + private String english; } -- Gitblit v1.7.1