From 24a92d0c1fd0a96ccdb1fc5b43aafe7ddd68fa93 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期二, 14 十一月 2023 19:09:42 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into chenjiahe-订单积分

---
 phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopSaleService.java |    1 +
 1 files changed, 1 insertions(+), 0 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 67cd3c8..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,4 +99,5 @@
     @PostMapping("/admin/export/shop/room/list")
     Result roomList(@RequestBody ShopReportDto shopReportDto);
 
+
 }

--
Gitblit v1.8.0