Merge branch 'master' into master-test

ANDRU-PC\Andru

2023-02-28 adfe35e0fd08f5ec8e93fcaa9171c8d0719c0065

Merge branch 'master' into master-test

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

@@ -9,6 +9,7 @@
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;

/**
 * 这里这个name 需要填写 请求的服务提供者的注册到nacos Server上面的服务名，path 是请求接口前缀
@@ -59,4 +60,8 @@
    /**标签分类数据列表*/
    @PostMapping("/tag/rule/info/list")
    Result listData(@RequestBody TagRuleInfoDto tagRuleInfoDto);

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

 phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java

@@ -69,6 +69,6 @@
    private String email;
    /**头像*/
    private String imgUrl;

    private String hisId;
    private String userBelongingType;
}