Merge branch 'master' of https://gitee.com/xiaochen991015/xizang

无关风月

2025-03-06 835e495a985e7ab0f9f3a1a3882255280f1b8f04

 ruoyi-system/src/main/java/com/ruoyi/system/query/SysUserQuery.java

@@ -12,10 +12,10 @@
public class SysUserQuery extends BasePage {

    @ApiModelProperty(value = "姓名")
    private String nickNameAndPhone;
    private String nickNameOrPhone;

    @ApiModelProperty(value = "角色id")
    private Integer roleId;
    private List<Integer> roleIds;

    @ApiModelProperty(value = "部门id集合")
    private List<String> deptIds;