Merge remote-tracking branch 'origin/rx-添加好友' into master-test

rx

2024-04-23 7c80ff8ad066e1669eb7630d3b1366a5c9286a55

Merge remote-tracking branch 'origin/rx-添加好友' into master-test

# Conflicts:
#	phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java

 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java

@@ -146,4 +146,10 @@
     */
    @PostMapping(value = "/user/arrive/edit")
    Result arriveEdit(@RequestBody com.alibaba.fastjson.JSONObject data);

    /**
     * 开放平台-员工获取获取短信内容链接
     */
    @PostMapping(value = "/user/acquisition/get/link")
    Result getUserAcquisitionLink(@RequestBody UserParamDto userParamDto);
}