Merge remote-tracking branch 'origin/master'

zuojincheng

2025-06-24 07386c2258263d8f9c357f581d2ec2f3a4696cbf

 pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/delSome/DelSomeIntakeAmountSv.java

@@ -40,7 +40,7 @@
                        //取水口变了
                        first = vo ;
                    }else{
                        if(first.dt.equals(vo.dt)) {
                        if(!first.dt.equals(vo.dt)) {
                            //日期变了
                            first = vo ;
                        }else{