Merge branch 'master-base' into master-prod-new

chenjiahe

2024-07-25 37993b3cf3243e6ffdacab526b04dd2284565a42

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