Merge remote-tracking branch 'origin/master-test' into master-test

fhx

2023-08-15 3b48383729e46bbd4ab0a2867df497489acb4338

 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;
}