Merge branch 'master' into master-test

ANDRU-PC\Andru

2023-04-26 18dcbf0a7fb4cb3d674d21225a05952a228563c4

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

@@ -21,6 +21,7 @@

    /**
     * 订单详情
     * 转换用OrderDetailDt
     */
    @PostMapping(value = "/order/detail")
    Result orderDetail(@RequestParam("orderId") String orderId);
@@ -37,5 +38,15 @@
    @PostMapping(value = "/order/numByActivityId")
    Result queryOrderNumByActivityId(@RequestParam("activityId") String activityId);

    /**
     * 订单列表
     */
    @PostMapping(value = "/order/deta/all")
    Result getOrderDetasAll(@RequestBody OrderDto orderDto);

    /**
     * 订单列表
     */
    @PostMapping(value = "/getOrderCustomerConfirm")
    Result getOrderCustomerConfirm(@RequestBody OrderDto orderDto);
}