Merge remote-tracking branch 'origin/master-test' into master-test

fwq

2024-04-11 2bbfc3169ec968b3d3ce87bbc9bdd4e04501e377

Merge remote-tracking branch 'origin/master-test' into master-test

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

@@ -140,4 +140,10 @@
     */
    @PostMapping(value = "/user/common/approve/create")
    Result commonApproveCreate(@RequestBody MarketingTotalDto marketingTotalDto);

    /**
     * 到访更新用户信息
     */
    @PostMapping(value = "/user/arrive/edit")
    Result arriveEdit(@RequestBody com.alibaba.fastjson.JSONObject data);
}