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/dto/QuerySystemUserDTO.java

@@ -30,6 +30,9 @@
    @ApiModelProperty(value = "用户名")
    private String username;

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


    @ApiModelProperty(value = "用户名、手机号模糊查询")
    private String keyword;
@@ -61,11 +64,20 @@

    @ApiModelProperty(value = "城市编码", hidden = true)
    private List<Integer> cityIds;
    @ApiModelProperty(value = "类型 0平台用户 1企业用户 2主播")
    @ApiModelProperty(value = "类型 0平台用户 1企业用户 2商户")
    private Integer type;


    @ApiModelProperty(value = "用户类型集合",hidden = true )
    private List<Integer> typeList;

    @ApiModelProperty(value = "部门主键 - 新")
    private Integer companyDepartmentId;

    @ApiModelProperty(value = "部门名称 - 新")
    private String companyDepartmentPathName;





}