测试git提交冲突问题

刘小明

2024-08-15 830e18bcfac0a9ac2c5c9e175affc4b9c1889a58

 pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proItems/QueryVo.java

@@ -11,5 +11,5 @@
@Builder
public class QueryVo extends QueryConditionVo {
    public String item;
    public String proName;
    public Long proId;
}