Merge branch 'master' into master-test

ANDRU-PC\Andru

2023-04-28 cf2348cea6505b3a3777827bb64b6310de010f2e

 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;


/**
@@ -47,7 +46,7 @@
     * 其它业绩信息
     * ShopOtherVo
     */
    @RequestMapping("/admin/export/shop/other/list")
    @PostMapping("/admin/export/shop/other/list")
    Result otherInAchievement(@RequestBody ShopReportDto shopReportDto);

}