Merge branch 'dev'

zhaoxiaohao

2020-11-20 f5dd3518168a3960cae11b34460c0cd4fbd63e26

 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;
}