From 0eb67c3b6badf538c959a5e68d293515720187c8 Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期五, 28 四月 2023 18:22:12 +0800
Subject: [PATCH] Merge branch 'master' into master-test

---
 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java |   11 +++++++----
 phis-feign/src/main/java/com/hz/his/dto/user/UserAttentionProductDto.java        |   27 +++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/UserAttentionProductDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/UserAttentionProductDto.java
new file mode 100644
index 0000000..134554b
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/UserAttentionProductDto.java
@@ -0,0 +1,27 @@
+package com.hz.his.dto.user;
+
+import lombok.Data;
+
+/**
+ * 鐢ㄦ埛鍏虫敞椤圭洰璁板綍
+ */
+@Data
+public class UserAttentionProductDto {
+
+    /**鐢ㄦ埛Id*/
+    private String userId;
+    /**鍏叡绫诲瀷(OrderItemConstants)*/
+    private String commonType;
+    /**鍏叡鏍囪瘑*/
+    private String commonId;
+    /**鍏叡鍚嶇О*/
+    private String commonName;
+
+    /**璇锋眰鍙傛暟*/
+    private String pageRoute;
+    /**璇锋眰鍙傛暟*/
+    private String requestParameter;
+
+    public UserAttentionProductDto() {
+    }
+}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java
index 3ea198b..0e9fc67 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java
@@ -1,10 +1,7 @@
 package com.hz.his.feign.service.platform;
 
 import com.hx.resultTool.Result;
-import com.hz.his.dto.user.UserInviteeInfoDto;
-import com.hz.his.dto.user.UserListDto;
-import com.hz.his.dto.user.UserParamDto;
-import com.hz.his.dto.user.UserUnionDto;
+import com.hz.his.dto.user.*;
 import com.hz.his.dto.user.coupon.UserCouponDto;
 import com.hz.his.dto.user.project.UserProjectDto;
 import net.sf.json.JSONObject;
@@ -81,4 +78,10 @@
      */
     @PostMapping("user/invitee/info")
     Result userInviteeInfo(@RequestBody UserInviteeInfoDto userInviteeInfoDto);
+
+    /**
+     * 鐢ㄦ埛鍏虫敞浜у搧璁板綍
+     */
+    @PostMapping("/attention/product/edit")
+    Result userAttentionProductRecord(@RequestBody UserAttentionProductDto userAttentionProductDto);
 }
\ No newline at end of file

--
Gitblit v1.8.0