Merge branch 'master-prod-new' into master-test

fhx

2023-08-14 827d118f2923861f2aa8871b722f8d104c637a6e

 phis-feign/src/main/java/com/hz/his/dto/order/OrderCountShouldTotalDto.java

@@ -17,6 +17,8 @@
    private String shopId;
    //用户优惠券
    private String couponNumberId;
    //订单应付金额
    private  BigDecimal shouldTotal;
    //商品item信息
    private List<OrderCountShouldTotalItemDto> itemDtoList;
}