Merge remote-tracking branch 'origin/dev_New' into dev_New

maven

10 小时以前 1cf92e13371b55c4449ccb48b264eea547eccb86

 src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java

@@ -680,7 +680,7 @@
                salesLedgerProduct.setType(type);
                salesLedgerProduct.setNoInvoiceNum(salesLedgerProduct.getQuantity());
                salesLedgerProduct.setNoInvoiceAmount(salesLedgerProduct.getTaxInclusiveTotalPrice());
                salesLedgerProduct.setInvoiceTotal(salesLedgerProduct.getTaxInclusiveTotalPrice());
                salesLedgerProduct.setPendingInvoiceTotal(salesLedgerProduct.getTaxInclusiveTotalPrice());
                salesLedgerProductMapper.insert(salesLedgerProduct);

                ProductOrder productOrder = new ProductOrder();