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

jiangping

2024-12-27 5506edbe54883b31db3cc8e4a1d9d0795a18a3c9

 server/service/src/main/java/com/doumee/dao/system/vo/SystemUserListVO.java

@@ -23,18 +23,33 @@

    @ApiModelProperty(value = "岗位信息")
    private List<SystemPosition> positions;

    @ApiModelProperty(value = "部门信息")
    private SystemDepartment department;
//
//    @ApiModelProperty(value = "部门信息")
//    private SystemDepartment department;

    @ApiModelProperty(value = "创建人信息")
    private SystemUser createUserInfo;

    @ApiModelProperty(value = "更新人信息")
    private SystemUser updateUserInfo;

    @ApiModelProperty(value = "企业名称")
    private String companyName;

    @ApiModelProperty(value = "组织名称")
    private String companyDepartmentPathName;

    @ApiModelProperty(value = "组织主键")
    private Integer companyDepartmentId;

    @ApiModelProperty(value = "全组织主键")
    private String companyDepartmentPathId;

    @ApiModelProperty(value = "已授权企业数")
    private Integer authNum;

    @ApiModelProperty(value = "是否超管 1=是；0=否")
    private String isAdmin;

    @ApiModelProperty(value = "主播端地址")
    private String zhuboRoomUrl;