Merge branch 'master' into master-test

ANDRU-PC\Andru

2023-07-18 9574cd990b7e32f966edc45824f8f952b5215d58

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