Merge remote-tracking branch 'origin/master'

jiangping

2024-05-20 dc22358d8624d3f5a2c27ee6c27e0bdbfe705fe9

 server/system_service/src/main/java/com/doumee/dao/system/model/SystemUser.java

@@ -102,5 +102,10 @@

    @ApiModelProperty(value = "0 启用 1 禁用")
    private Integer status;
    @ApiModelProperty(value = "企业编码（关联company）")
    private Integer companyId;
    @ApiModelProperty(value = "0 启用 1 禁用")
    @TableField(exist = false)
    private String companyName;

}