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

gongzuming

2024-09-09 ead65cd9b15cd574f4e37c3376c7447efea53935

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

@@ -117,6 +117,7 @@
        s.setReason(dto.getReason());
        s.setStatus(Constants.ORDER_SALES_STATUS.PENDING.name());
        s.create(userId);
        s.setSalesType(dto.getSalesType());
        orderItemSalesMapper.insert(s);

        return s.getId();