Merge remote-tracking branch 'origin/master'

zhangzeli

2021-11-09 fe2b2e037a91fbc22bd887174d37c7dd229333d3

 xboot-core/src/main/java/cn/exrick/xboot/core/entity/User.java

@@ -114,4 +114,5 @@
    @TableField(exist = false)
    @ApiModelProperty(value = "导入数据时使用")
    private Integer defaultRole;

}