解决冲突

liurunyu

2024-07-25 7af935e6a092193adf309f3a2d700f049b4b63d8

 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;