From baf3e35721a6d6154e6bed809240c26c5c3b27dc Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期一, 17 四月 2023 11:11:06 +0800
Subject: [PATCH] Merge branch 'master' into master-test

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

diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopDayService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopDayService.java
index c06f6fa..a82dc30 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopDayService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopDayService.java
@@ -5,7 +5,6 @@
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
 
 
 /**
@@ -17,32 +16,37 @@
 
     /**
      * 鏃ユ姤琛�-褰撴棩鍒板簵淇℃伅
+     * ArriveShopVo
      */
     @PostMapping("/admin/export/shop/day/arriveShop")
     Result arriveShop(@RequestBody ShopReportDto shopReportDto);
 
     /**
      * 鏃ユ姤琛�-褰撴棩鍚勪笟缁╂寚鏍�
+     * ShopAchievementVo
      */
     @PostMapping("/admin/export/shop/day/indicators")
     Result indicators(@RequestBody ShopReportDto shopReportDto);
 
     /**
      * 鏂拌�佷細鍛樻暟鎹�
+     * ShopOldLeadNewVo
      */
     @PostMapping("/admin/export/shop/day/old/lead/new")
     Result oldLeadNew(@RequestBody ShopReportDto shopReportDto);
 
     /**
      * 閲嶇偣椤圭洰鎸囨爣鏁版嵁
+     * ShopImportantProjectVo
      */
     @PostMapping("/admin/export/shop/important/project/indicators/list")
     Result importantProjectIndicators(@RequestBody ShopReportDto shopReportDto);
 
     /**
      * 鍏跺畠涓氱哗淇℃伅
+     * ShopOtherVo
      */
-    @RequestMapping("/admin/export/shop/other/list")
+    @PostMapping("/admin/export/shop/other/list")
     Result otherInAchievement(@RequestBody ShopReportDto shopReportDto);
 
 }

--
Gitblit v1.8.0