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/statistics/StClientAmountDaySv.java |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/statistics/StClientAmountDaySv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/statistics/StClientAmountDaySv.java
index 9a97dd0..72fdb43 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/statistics/StClientAmountDaySv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/statistics/StClientAmountDaySv.java
@@ -5,10 +5,8 @@
 import com.dy.pipIrrGlobal.daoRm.RmClientAmountDayMapper;
 import com.dy.pipIrrGlobal.daoSt.StClientAmountDayMapper;
 import com.dy.pipIrrGlobal.pojoSt.StClientAmountDay;
-import com.dy.pipIrrGlobal.pojoSt.StConsumeClientMonth;
-import com.dy.pipIrrGlobal.pojoSt.StConsumeClientYear;
 import com.dy.pipIrrGlobal.voSt.VoClientAmountStatistics;
-import com.dy.pipIrrGlobal.voSt.VoClientConsumeStatistics;
+import com.dy.pipIrrTemp.util.StClientAmountConstant;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

--
Gitblit v1.8.0