From bb0c7d3c6cecdfd04f3a191b59a1b9a8853d69e2 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Mon, 15 Jun 2020 16:12:47 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev
---
kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/model/SysOrganization.java | 81 ++++++++++++++++++++--------------------
1 files changed, 41 insertions(+), 40 deletions(-)
diff --git a/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/model/SysOrganization.java b/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/model/SysOrganization.java
index 7c300f1..0bffe68 100644
--- a/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/model/SysOrganization.java
+++ b/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/model/SysOrganization.java
@@ -1,25 +1,22 @@
package com.kidgrow.common.model;
-import com.kidgrow.common.model.SuperModel;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
-import org.hibernate.validator.constraints.*;
-import java.util.Date;
+import org.hibernate.validator.constraints.NotBlank;
+
+import javax.validation.constraints.NotNull;
/**
* 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
+ *
+ * @version 1.0
* @Description: 组织架构表<br>
* @Project: 用户中心<br>
* @CreateDate: Created in 2020-03-31 11:01:35 <br>
* @Author: <a href="4345453@kidgrow.com">liuke</a>
- * @version 1.0
*/
@Data
@EqualsAndHashCode(callSuper = false)
@@ -27,36 +24,40 @@
@AllArgsConstructor
@TableName("sys_organization")
public class SysOrganization extends SuperModel {
- private static final long serialVersionUID=1L;
+ private static final long serialVersionUID = 1L;
- /**
- * 节点级别取值 0-9
- */
- @NotBlank(message = "节点级别取值 0-9不能为空")
- private Integer orgLevel;
- /**
- * 节点属性（集团/公司/部门等，取值0，1，2，3，4）
- */
- private Integer orgAttr;
- /**
- * 上级组织ID
- */
- private Long orgParentId;
- /**
- * 组织名称
- */
- @NotBlank(message = "组织名称不能为空")
- private String orgName;
- /**
- * 排序
- */
- private Integer orgOrder;
- /**
- * 是否删除，1删除，0未删除
- */
- private Boolean isDel;
- /**
- * 状态，1启用，0停用
- */
- private Boolean enabled;
- }
+ /**
+ * 节点级别取值 0-9
+ */
+ @NotNull(message = "节点级别取值 0-9不能为空")
+ private Integer orgLevel;
+ /**
+ * 节点属性（集团/公司/部门等，取值0，1，2，3，4）
+ */
+ private Integer orgAttr;
+ /**
+ * 上级组织ID
+ */
+ private Long orgParentId;
+ /**
+ * 组织名称
+ */
+ @NotBlank(message = "组织名称不能为空")
+ private String orgName;
+ /**
+ * 排序
+ */
+ private Integer orgOrder;
+ /**
+ * 部门的code
+ */
+ private String orgCode;
+ /**
+ * 是否删除，1删除，0未删除
+ */
+ private Boolean isDel;
+ /**
+ * 状态，1启用，0停用
+ */
+ private Boolean enabled;
+}
--
Gitblit v1.8.0