Merge branch 'master' into pay_master

zhaoxiaohao

2020-09-21 37781bdea9b06d42eaae0df34591697b290ae20c

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