Merge branch 'master' into master-test

wangrenhuang

2023-04-17 baf3e35721a6d6154e6bed809240c26c5c3b27dc

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

@@ -15,9 +15,9 @@
@FeignClient(name="phis-service",contextId = "phis-order")
public interface SOrderService {
    /**
     * 查询用户订单详情接口
     * 查询订单详情接口
     * @return
     */
    @RequestMapping("/order/get/one")
    @RequestMapping("/order/feign/get/one")
    Result getAllGoods(@RequestParam("orderId") String orderId);
}