From 5698fef448d17df14055d2b64cedf20f46bac205 Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Tue, 29 Sep 2020 11:17:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pay_master' into pay_master
---
kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/model/SysOrganization.java | 7 +++++++
1 files changed, 7 insertions(+), 0 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 0bffe68..bb44a24 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,6 +1,8 @@
package com.kidgrow.common.model;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -38,6 +40,7 @@
/**
* 上级组织ID
*/
+ @JsonSerialize(using = ToStringSerializer.class)
private Long orgParentId;
/**
* 组织名称
@@ -57,6 +60,10 @@
*/
private Boolean isDel;
/**
+ * 是否删除，1删除，0未删除
+ */
+ private String createUserOrgCode;
+ /**
* 状态，1启用，0停用
*/
private Boolean enabled;
--
Gitblit v1.8.0