Merge branch 'master-prod-new' into master-test

Andru

2024-01-05 d1082094bd984eed9559589196a8bfab19924555

 phis-feign/src/main/java/com/hz/his/feign/service/dcp/SPhisUserTagInfoService.java

@@ -13,5 +13,5 @@

    /**同步用户标签数据*/
    @PostMapping("/test/handlerSyncUserLabelInfo")
    Result handlerSyncUserLabelInfo(@RequestParam("userId") String userId);
    Result handlerSyncUserLabelInfo(@RequestParam("userId") String userId, @RequestParam("type") Integer type);
}