Merge remote-tracking branch 'origin/master'

mitao

2024-06-18 f81ae4085304f74db4454e9168af75d59496bb87

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceServiceImpl.java

@@ -79,8 +79,8 @@
        memberInvoice.setRiseType(memberInvoiceDTO.getRiseType());
        this.save(memberInvoice);

       List<Integer> memberInvoiceOrderList=memberInvoiceDTO.getOrderId();
       for (Integer memberInvoiceOrder:memberInvoiceOrderList){
       List<Long> memberInvoiceOrderList=memberInvoiceDTO.getOrderId();
       for (Long memberInvoiceOrder:memberInvoiceOrderList){
           MemberInvoiceOrder memberInvoiceOrder1=new MemberInvoiceOrder();
           Order order= iOrderService.getById(memberInvoiceOrder);
           order.setInvoiceStatus(1);