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

gongzuming

2024-09-02 cdabe8b7b132b8d947020fa6e528c8d3dbfa9b41

 src/main/java/com/mzl/flower/service/payment/OrderItemSalesService.java

@@ -351,8 +351,4 @@

        return oi;
    }

    private BigDecimal getAmount(BigDecimal amount){
        return amount == null ? new BigDecimal(0) : amount;
    }
}