Merge remote-tracking branch 'origin/master'

wuzeyu

2024-05-06 cd45cee236780a8e02244d8d8a916088ca002d3d

 pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/QueryVo.java

@@ -15,7 +15,7 @@
public class QueryVo extends QueryConditionVo {

    @Schema(description = "用户姓名")
    public String name;
    public String userName;

    @Schema(description = "用户姓名电话")
    public String phone;