Merge branch 'master' into master-v2

Cui Zhi Feng

2024-09-02 004f3f352e6430aeba68ac44ab86e2eeb3a6c9e3

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