From 262d511f52c7530f6f3ddbf595264f9880b4df4f Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期二, 14 十一月 2023 16:26:53 +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 | 13 +++++++------
1 files changed, 7 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..e02dcc3 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);
/**
* 瀵煎嚭鏀堕摱鎶ヨ〃
@@ -39,5 +34,11 @@
@PostMapping(value = "/exp/deduction/surface")
Result deductionSurface(@RequestBody DeductionSurfaceDto deductionSurfaceDto);
+ /**
+ * 瀵煎嚭鍒掓墸蹇収鎶ヨ〃
+ * 杞崲鏃�
+ */
+ @PostMapping(value = "/exp/deduction/surface/data")
+ Result deductionSurfaceData(@RequestBody DeductionSurfaceDto deductionSurfaceDto);
}
\ No newline at end of file
--
Gitblit v1.8.0