Merge remote-tracking branch 'origin/master'

mitao

2024-07-29 fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java

@@ -139,10 +139,8 @@
    @ApiModelProperty(value = "角色名称")
    @TableField(exist = false)
    private String roleName;
    
    @ApiModelProperty(value = "是否为拍卖师 1=否 2=是")
    @TableField(exist = false)
    private Integer isAuctioneer;


    @Override
    public String getRemark() {
        return remark;