Merge remote-tracking branch 'origin/master'

刘小明

2024-08-10 69b6617d589d2928ec94f9a47279654fe6f68025

 pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/user/QueryVo.java

@@ -16,5 +16,7 @@
    public String phone;

    public Long roleId;

    public Long disabled;
}