From 76c366f6eb77c7d55f32113c0528f95d21f023bd Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期四, 11 四月 2024 19:20:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-test' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/report/user/UserDetailSelectDto.java | 26 ++++++++++++++++++++++++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMicroRecordService.java | 4 ++++
2 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/user/UserDetailSelectDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/user/UserDetailSelectDto.java
new file mode 100644
index 0000000..ba36af5
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/user/UserDetailSelectDto.java
@@ -0,0 +1,26 @@
+package com.hz.his.dto.report.user;
+
+import com.hz.his.dto.report.UserDetailReportDto;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 鐢ㄦ埛鎶ヨ〃鏌ヨ瀹㈡埛淇℃伅
+ * @author fwq
+ * */
+@Data
+public class UserDetailSelectDto extends UserDetailReportDto {
+ /**鏌ヨ娲昏穬鑰乂IP鎯呭喌 鍕鹃�変汉鏁帮細鏌ヨ�佹椿璺冿紝鍕鹃�夋祦澶憋細娴佸け 鍕鹃�夋椿璺�/娌夌潯 鏌ョ姸鎬�*/
+
+ /**鏌ヨ瀹㈡埛绛夌骇*/
+ private List<String> userLevelList;
+ /**涓夊ぇ椤圭洰鏈墽琛� 闆嗗悎 锛堟瘡涓兘鏄崟閫夛級*/
+
+ /**棰滃�艰鍒�(涓�绾э紝浜岀骇锛屼笁绾х殑闆嗗悎)*/
+
+ /**RFM 闆嗗悎 R1..R2..绛夐兘鏄崟閫�*/
+
+ /**瀹㈢兢:绛夌骇鍗曢�夛紝瑙﹁揪鍗曢��*/
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMicroRecordService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMicroRecordService.java
index 393c879..e377fa1 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMicroRecordService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMicroRecordService.java
@@ -46,6 +46,10 @@
@PostMapping(value = "/micro/record/crm/see")
Result crmSee(@RequestBody MicroRecordDto dto);
+ /** crm鏌ョ湅璁板綍璇︽儏 - 棰滃�艰鍒�4.0鐗堟湰*/
+ @PostMapping(value = "/micro/record/crm/see/V2")
+ Result crmSeeV2(@RequestBody MicroRecordDto dto);
+
/** 鏍规嵁鐢ㄦ埛id鏌ヨ鏄惁鏈夋湭鏌ョ湅杩囩殑寰暣璁板綍 */
@PostMapping(value = "/micro/record/check/view")
Result checkView(@RequestBody MicroRecordDto dto);
--
Gitblit v1.8.0