Merge branch 'master-xlk' into master-xlk-test

fhx

2024-08-23 1e65523fba19e99dbdf71d0a731a7747a2c9d4e0

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

@@ -12,12 +12,12 @@
 * @Date: 2022/09/27/15:59
 * @Description:
 */
@FeignClient(name="phis-service",contextId = "phis-order")
@FeignClient(name="phi-pre-sys",path = "/appointment",contextId = "phis-order")
public interface SOrderService {
    /**
     * 查询用户订单详情接口
     * 查询订单详情接口
     * @return
     */
    @RequestMapping("/order/get/one")
    @RequestMapping("/order/feign/get/one")
    Result getAllGoods(@RequestParam("orderId") String orderId);
}