From 3128a684d6654131f01472ee95aa3f09a9d12dac Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期三, 26 三月 2025 14:24:50 +0800 Subject: [PATCH] 1、git同步冲突引起文件丢失,进行系统恢复,并屏蔽一个非git提交的模块; 2、增加文件《增加一个单位(orgTag)》。 --- pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/delSome/DelSomeIntakeAmountSv.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/delSome/DelSomeIntakeAmountSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/delSome/DelSomeIntakeAmountSv.java index fccec44..964209e 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/delSome/DelSomeIntakeAmountSv.java +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/delSome/DelSomeIntakeAmountSv.java @@ -40,7 +40,7 @@ //鍙栨按鍙e彉浜� first = vo ; }else{ - if(first.dt.equals(vo.dt)) { + if(!first.dt.equals(vo.dt)) { //鏃ユ湡鍙樹簡 first = vo ; }else{ -- Gitblit v1.8.0