From 06ac28e51012c15b620635ae9e6b979058b9118b Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期二, 25 七月 2023 16:12:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-test' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/deduction/DeductionDto.java | 3 +++
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopSaleService.java | 5 +++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSaleService.java | 5 +++++
3 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/deduction/DeductionDto.java b/phis-feign/src/main/java/com/hz/his/dto/deduction/DeductionDto.java
index db77806..a5e55e7 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/deduction/DeductionDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/deduction/DeductionDto.java
@@ -134,6 +134,9 @@
// phitab鍒掓墸鍒涘缓鏃堕棿
private Date phitabCreateTime;
+ // 鏄惁鍙戦�佸垝鎵ｆ秷鎭� 0 鍚� 1 鏄�
+ private int isSentNotice = 1;
+
public DeductionDto() {
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSaleService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSaleService.java
index af1b900..6f2fbd0 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSaleService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSaleService.java
@@ -112,4 +112,9 @@
@PostMapping("/admin/consultant/report/loss/user/rate/export")
Result lossUserListExport(@RequestBody EmployeeReportDto employeeReportDto);
+ /**鍜ㄨ甯�-鍜ㄨ甯�-绉戝涓氱哗*/
+ @PostMapping("/admin/consultant/report/room/list")
+ Result roomList(@RequestBody EmployeeReportDto employeeReportDto);
+
+
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopSaleService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopSaleService.java
index 9bc2b28..8acf876 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopSaleService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopSaleService.java
@@ -95,4 +95,9 @@
@PostMapping("/admin/export/shop/loss/user/rate/export")
Result lossUserRate(@RequestBody ShopReportDto shopReportDto);
+ /**闂ㄥ簵-绉戝涓氱哗*/
+ @PostMapping("/admin/export/shop/room/list")
+ Result roomList(@RequestBody ShopReportDto shopReportDto);
+
+
}
--
Gitblit v1.8.0