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

fwq

2023-05-06 c0c3ba60f8620d2700c76afb62732ef940c38c70

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