Merge branch 'master' into master-v2

Cui Zhi Feng

2024-08-30 852ec1d729b61077d8131591a5349c7e4a1bed79

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