Merge branch 'master' into master-test

ANDRU-PC\Andru

2023-05-06 765007dcc802b0539124cb4c780de665e6665509

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

@@ -17,6 +17,10 @@
@FeignClient(name="dcp-rules-service",path = "/dcp-rules",contextId = "userTagInfo")
public interface SUserTagInfoService {

    /** 标签分类树型列表 */
    @PostMapping("/tag/rule/info/list/tree")
    Result listTreeData();

    /**查询用户标签列表*/
    @PostMapping("/user/tag/info/list")
    Result userTagInfoListData(@RequestBody UserTagInfoDto userTagInfoDto);
@@ -35,10 +39,10 @@
     *          (是否自定义标签 否)"isCustom": 0,
     *          (标签类型编号)"typeNo": "constellation",
     *          (标签编号)"tagNo": "LA20220506bRnJDj"
     *                },
     *        {
     *          },
     *          {
     *          (是否自定义标签 是)"isCustom": 1,
     *          (标签类型编号 没有类型可以为空或不传)"typeNo": "constellation",
     *           (标签类型编号)"typeNo": "constellation",
     *          (标签编号)"tagName": "牛马座"
     *        }
     *    ],
@@ -60,4 +64,8 @@
    /**标签分类数据列表*/
    @PostMapping("/tag/rule/info/list")
    Result listData(@RequestBody TagRuleInfoDto tagRuleInfoDto);

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