Merge remote-tracking branch 'origin/master'

zhangxu

2022-11-28 0e563be0d9454bed92ad078fc3503d7ef0551f77

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java

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

@@ -111,6 +111,20 @@
    Result cancelApproval(@RequestBody AduitDto aduitDto);

    /**
     * 开放平台-开单
     * 实体转化用 CreateOrderReturnDto
     */
    @PostMapping(value = "/order/create")
    Result orderCreate(@RequestBody OrderPHisDto dto);

    /**
     * 开放平台-结账
     */
    @PostMapping(value = "/order/payMoney")
    Result orderPayMoney(@RequestBody PayDto dto);


    /**
     * 开放平台-部分退款
     * data 实体转化用 CancelOrderReturnDto
     */