Merge branch 'fhx-prod-热门活动' into master-prod-new

fhx

2023-08-07 1f958e1435689b008e04f9d3c6d5133d0c3a9b8c

 phis-feign/src/main/java/com/hz/his/feign/service/phisAdmin/SLabelInfoService.java

@@ -14,5 +14,5 @@
     * 标签分类树型列表(搜索)
     */
    @RequestMapping("/foreign/api/user/label/type/tree/list")
    Result listTreeData();
    Result userLabelTypeTreeList();
}