Merge branch 'master' of http://bore.pub:10439/r/ERP_override

chenlu

2024-08-02 209ed077c07f53746761e5149c97345f62e38cc1

 north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java

@@ -381,6 +381,7 @@
                    .eq("`column`",orderOtherMoney.getColumn()));
        });
        order.setMoney(money+orderOtherMoneyMapper.selectGrossAmount(order.getOrderId()));
        order.setOtherMoney(orderOtherMoneyMapper.selectGrossAmount(order.getOrderId()));
        orderMapper.updateMoney(order);
        orderDetailMapper.updateOrderMoney(OrderDetails);
        return false;