From fc9cac864414b566e3516f6702b716e8ed00e9dc Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 26 六月 2023 16:34:29 +0800
Subject: [PATCH] Merge branch 'master' into master-test

---
 phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/SExportService.java |   13 +++++--------
 1 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/SExportService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/SExportService.java
index e159665..e6207fc 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/SExportService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/SExportService.java
@@ -1,11 +1,8 @@
 package com.hz.his.feign.service.platform.bi;
 
 import com.hx.resultTool.Result;
-import com.hz.his.dto.file.FileExUpdateDto;
-import com.hz.his.dto.file.FileExportDto;
-import com.hz.his.vo.bi.exp.CashierSettlementVo;
-import com.hz.his.vo.bi.exp.CashierSurfaceVo;
-import com.hz.his.vo.bi.exp.DeductionSurfaceVo;
+import com.hz.his.dto.report.CashierSettlementDto;
+import com.hz.his.dto.report.DeductionSurfaceDto;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -21,21 +18,21 @@
      * 鏃犺浆鎹�
      */
     @PostMapping(value = "/exp/cashier/settlement")
-    Result cashierSettlement(@RequestBody CashierSettlementVo cashierSettlementVo);
+    Result cashierSettlement(@RequestBody CashierSettlementDto cashierSettlementDto);
 
     /**
      * 瀵煎嚭鏀堕摱鎶ヨ〃
      * 杞崲鏃�
      */
     @PostMapping(value = "/exp/cashier/surface")
-    Result cashierSurface(@RequestBody CashierSurfaceVo cashierSurfaceVo);
+    Result cashierSurface(@RequestBody CashierSettlementDto cashierSettlementDto);
 
     /**
      * 瀵煎嚭鍒掓墸鎶ヨ〃
      * 杞崲鏃�
      */
     @PostMapping(value = "/exp/deduction/surface")
-    Result deductionSurface(@RequestBody DeductionSurfaceVo deductionSurfaceVo);
+    Result deductionSurface(@RequestBody DeductionSurfaceDto deductionSurfaceDto);
 
 
 }
\ No newline at end of file

--
Gitblit v1.8.0