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

fwq

2023-07-12 d07e5cacbf0f3c1e1b5b42e115e1de574de55aea

 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);
}