From 5fccfd521d02ae9a3cd29a0bdc9dcf4b4b179f59 Mon Sep 17 00:00:00 2001 From: 克 刘 <4345453@qq.com> Date: Fri, 10 Apr 2020 11:40:25 +0800 Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev --- kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysArea.java | 21 ++++++++++++++++++--- 1 files changed, 18 insertions(+), 3 deletions(-) diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysArea.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysArea.java index 7b93ba0..57cfc7b 100644 --- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysArea.java +++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysArea.java @@ -1,11 +1,13 @@ package com.kidgrow.usercenter.model; +import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; -import com.kidgrow.common.model.SuperModel; +import com.baomidou.mybatisplus.extension.activerecord.Model; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.hibernate.validator.constraints.NotEmpty; /** * 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br> @@ -21,12 +23,16 @@ @NoArgsConstructor @AllArgsConstructor @TableName("sys_area") -public class SysArea extends SuperModel { - private static final long serialVersionUID = 1L; +public class SysArea extends Model<SysArea> { + /** + * 区域id + */ + private Long id; /** * 区域名称 */ + @NotEmpty(message = "区域名称不能为空") private String areaName; /** * 父级区域id @@ -60,4 +66,13 @@ * 名称拼音 */ private String areaCh; + /** + * 状态,1启用,0停用 + */ + private Boolean enabled; + /** + * 是否删除,1删除,0未删除 + */ + @TableLogic + private Boolean isDel; } -- Gitblit v1.8.0