From 1d5345f92dbd4aac2b5f68265921bb2529a71b8e Mon Sep 17 00:00:00 2001 From: bingbing <zhaobingliang@aliyun.com> Date: Tue, 27 Oct 2020 14:16:21 +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/SysRole.java | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/model/SysRole.java b/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/model/SysRole.java index 43d0f14..da1b7d8 100644 --- a/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/model/SysRole.java +++ b/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/model/SysRole.java @@ -30,4 +30,5 @@ @JsonSerialize(using = ToStringSerializer.class) @TableField(exist = false) private Long userId; + private Integer type; } -- Gitblit v1.8.0