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

guoyuji

2024-06-25 8668e5ce64e1d7b3dbfffc42cf6767cb9ea2d6c0

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

@@ -648,7 +648,7 @@
               )
    </insert>

    <select id="exportFinishedOperateLogReport" resultMap="selectFinishedGoodsInventory">
    <select id="exportFinishedOperateLogReport">
        select fol.id,
               fol.operation_order_number,
               fol.order_id,