测试git提交冲突问题

刘小明

2024-08-15 830e18bcfac0a9ac2c5c9e175affc4b9c1889a58

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

@@ -10,5 +10,5 @@
@AllArgsConstructor
@Builder
public class QueryVo extends QueryConditionVo {
    public String name;
    public String userName;
}