测试git提交冲突问题

刘小明

2024-08-15 830e18bcfac0a9ac2c5c9e175affc4b9c1889a58

 pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/taskPlan/QueryVo.java

@@ -13,7 +13,7 @@
    public String startDate;
    public String endDate;
    public Long proId;
//    public Long batchId;
    public Long batchId;
    public Long planId;
    public Integer addNum;
}