From 98fb4b2802f949a730b87f55a8d100272817ac3e Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Fri, 07 Aug 2020 18:46:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/model/SysUserOrg.java | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/model/SysUserOrg.java b/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/model/SysUserOrg.java
index 06aacd2..c51622b 100644
--- a/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/model/SysUserOrg.java
+++ b/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/model/SysUserOrg.java
@@ -1,5 +1,7 @@
package com.kidgrow.common.model;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -40,6 +42,17 @@
@NotNull(message = "组织ID不能为空")
private Long orgId;
/**
+ * 医院/科室表里面的id
+ */
+ @JsonSerialize(using = ToStringSerializer.class)
+ @NotNull(message = "医院/科室表里面的id")
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
+ private Long fromId;
+ /**
+ * 组织级别 0集团 1医院公司 2科室部门
+ */
+ private Integer fromLevel;
+ /**
* 数据权限code
*/
private String createUserOrgCode;
--
Gitblit v1.8.0