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

xuxueyang

2024-09-18 38d8abee8db1034b4cc3fae8613e8328653a1080

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

@@ -274,6 +274,8 @@

        dto.setParams(parseArray(oi.getFlowerParams(), ParamItemDTO.class));

        dto.setNum(oi.getNum());

        return dto;
    }

@@ -309,6 +311,8 @@

        dto.setParams(parseArray(oi.getFlowerParams(), ParamItemDTO.class));

        dto.setNum(oi.getNum());

        return dto;
    }