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

Andru

2024-01-12 efe28af6e1689ed5bd7edbd57b02421863fe8793

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