2023-12-28 朱宝民 根据水卡编号获取操作记录，重构农户查询，返回23个字段

Administrator

2023-12-28 51dab03d03a4f3f671a64c3660c42e5241357c9b

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestConflict.java

@@ -11,5 +11,7 @@
        System.out.println("test31");
        System.out.println("test32");
        System.out.println("test33");
        System.out.println("test34");
        System.out.println("test33");
    }
}