From e74dade001072c3a0e93cd6d698df4df2262f5a3 Mon Sep 17 00:00:00 2001 From: chenjiahe <763432473@qq.com> Date: 星期四, 01 八月 2024 22:30:27 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master-base' into master-test --- phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiUserService.java | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiUserService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiUserService.java index 2fe0bb2..99c78f4 100644 --- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiUserService.java +++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiUserService.java @@ -4,6 +4,7 @@ import com.hz.his.dto.report.UserDetailReportDto; import com.hz.his.dto.report.UserReportDto; import com.hz.his.dto.report.UserReportListDto; +import com.hz.his.dto.report.user.UserDetailSelectDto; import com.hz.his.dto.user.UserDto; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; @@ -109,7 +110,12 @@ * rfm瀹㈡埛姒傝-鎼滅储鐢ㄦ埛鍒楄〃 */ @PostMapping("/admin/rfmUser/report/user/search/list") - Result userSearchList(@RequestBody UserDetailReportDto userDetailReportDto); + Result userSearchList(@RequestBody UserDetailSelectDto userDetailSelectDto); + /** + * rfm瀹㈡埛姒傝-鎼滅储鐢ㄦ埛鍒楄〃-瀵煎嚭 + */ + @PostMapping("/admin/rfmUser/report/user/search/export") + Result userSearchExport(@RequestBody UserDetailSelectDto userDetailSelectDto); } -- Gitblit v1.8.0