Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

chenlu

2024-02-23 a6e5c0dc4945125eea36c4c291ad12705fd96a38

 north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml

@@ -303,7 +303,7 @@
                                            operate_time
        )
        values (
                   #{orderDetail.deliveryDetail.deliveryId} ,#{orderDetail.deliveryDetail.order_id},#{orderDetail.deliveryDetail.orderNumber}
                   #{orderDetail.deliveryDetail.deliveryId} ,#{orderDetail.deliveryDetail.orderId},#{orderDetail.deliveryDetail.orderNumber}
                   ,"出库",#{userName},#{orderDetail.warehouseNum},now()
               )
    </insert>