Merge remote-tracking branch 'origin/dev' into dev

zhaoxiaohao

2020-08-08 4d9483cecdeb9e13a7ea4475121351b02058a51b

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