From 2e6ac4f07eac76c58881cae76b2e9bf1cb6e6943 Mon Sep 17 00:00:00 2001 From: cdf <857448963@qq.com> Date: Thu, 16 May 2024 10:20:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B2=B3=E5=8C=97=E4=B8=A4=E7=BA=A7=E8=B4=AF?= =?UTF-8?q?=E9=80=9A=E6=96=87=E6=A1=A3=E4=BF=AE=E6=94=B9=20=E5=86=80?= =?UTF-8?q?=E5=8C=97=E5=8F=B0=E8=B4=A6=E7=AE=A1=E7=90=86=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../harmonic/controller/upload/EvaluationDownController.java | 4 ++-- .../njcn/harmonic/service/upload/IEvaluationDataService.java | 2 +- .../service/upload/impl/REvaluationDataServiceImpl.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/EvaluationDownController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/EvaluationDownController.java index dfadc59d2..f1f58f5b5 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/EvaluationDownController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/EvaluationDownController.java @@ -5,10 +5,10 @@ import com.njcn.common.pojo.annotation.OperateInfo; import com.njcn.common.pojo.enums.common.LogEnum; import com.njcn.harmonic.pojo.param.upload.DimBusBarParam; import com.njcn.harmonic.pojo.vo.upload.DimBusBarVO; -import com.njcn.harmonic.pojo.vo.upload.PmsHttpResult; -import com.njcn.harmonic.pojo.vo.upload.PmsPage; import com.njcn.harmonic.service.upload.IEvaluationDataService; import com.njcn.web.controller.BaseController; +import com.njcn.web.pojo.dto.PmsHttpResult; +import com.njcn.web.pojo.dto.PmsPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/IEvaluationDataService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/IEvaluationDataService.java index 5f9f6b91e..69eeb61d4 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/IEvaluationDataService.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/IEvaluationDataService.java @@ -7,8 +7,8 @@ import com.njcn.harmonic.pojo.param.UploadParam; import com.njcn.harmonic.pojo.param.upload.DimBusBarParam; import com.njcn.harmonic.pojo.po.upload.RUploadEvaluationDataD; import com.njcn.harmonic.pojo.vo.upload.DimBusBarVO; -import com.njcn.harmonic.pojo.vo.upload.PmsPage; import com.njcn.harmonic.pojo.vo.upload.UploadEvaluationDataVo; +import com.njcn.web.pojo.dto.PmsPage; /** *

diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/REvaluationDataServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/REvaluationDataServiceImpl.java index 6a9cfbaf1..94adbcbe1 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/REvaluationDataServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/REvaluationDataServiceImpl.java @@ -29,7 +29,6 @@ import com.njcn.harmonic.pojo.param.UploadParam; import com.njcn.harmonic.pojo.param.upload.DimBusBarParam; import com.njcn.harmonic.pojo.po.upload.*; import com.njcn.harmonic.pojo.vo.upload.DimBusBarVO; -import com.njcn.harmonic.pojo.vo.upload.PmsPage; import com.njcn.harmonic.pojo.vo.upload.UploadEvaluationDataVo; import com.njcn.harmonic.service.upload.IEvaluationDataService; import com.njcn.system.api.DicDataFeignClient; @@ -39,6 +38,7 @@ import com.njcn.user.api.DeptFeignClient; import com.njcn.user.pojo.po.Dept; import com.njcn.web.enums.GWSendEnum; import com.njcn.web.factory.PageFactory; +import com.njcn.web.pojo.dto.PmsPage; import com.njcn.web.pojo.param.SendParam; import com.njcn.web.utils.GwSendUtil; import lombok.RequiredArgsConstructor;