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

houruijun

2020-06-15 8190823a593d3123384d3a75774ad19ecea07204

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