From 85d1dc328bd46089b63b57bd356908cbba26e29c Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期一, 23 十月 2023 16:45:19 +0800
Subject: [PATCH] Merge branch 'master' into master-test

---
 phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopSaleService.java |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

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 f6699cb..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
@@ -99,8 +99,5 @@
     @PostMapping("/admin/export/shop/room/list")
     Result roomList(@RequestBody ShopReportDto shopReportDto);
 
-    /**闂ㄥ簵-鍒嗙被涓氱哗*/
-    @PostMapping("/admin/export/shop/project/type/list")
-    Result projectTypeList(@RequestBody ShopReportDto shopReportDto);
 
 }

--
Gitblit v1.8.0