From 32e2c1f5097f36fe37ea2969f6337d24f55576f4 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期六, 24 六月 2023 18:24:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new

---
 phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/SExportService.java |    7 +------
 1 files changed, 1 insertions(+), 6 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 3292647..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,13 +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.dto.report.CashierSettlementDto;
 import com.hz.his.dto.report.DeductionSurfaceDto;
-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 org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -23,7 +18,7 @@
      * 鏃犺浆鎹�
      */
     @PostMapping(value = "/exp/cashier/settlement")
-    Result cashierSettlement(@RequestBody CashierSettlementVo cashierSettlementVo);
+    Result cashierSettlement(@RequestBody CashierSettlementDto cashierSettlementDto);
 
     /**
      * 瀵煎嚭鏀堕摱鎶ヨ〃

--
Gitblit v1.8.0