Merge branch 'master-stander' into master-jiayan

fwq

2024-07-14 0fb1148dee85fa073f823b7d1e2de585b92d492f

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

@@ -7,12 +7,12 @@
/**
 * 这里这个name 需要填写 请求的服务提供者的注册到nacos Server上面的服务名，path 是请求接口前缀
 */
@FeignClient(name="phis-service", contextId = "labelInfo")
@FeignClient(name="phi-pre-sys",path = "/appointment", contextId = "labelInfo")
public interface SLabelInfoService {

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