Merge branch 'master' into master-test

wangrenhuang

2023-05-22 a4d937e5e739d50b304a144da4c3317146b055d9

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