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

guoyuji

2024-11-26 ea5760843ac6fa45c455a0d50ac0e7bef351b64a

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

@@ -781,7 +781,7 @@
            </if>

        </where>
        order by fgi.id desc
        order by fgi.update_time desc

        limit #{offset},#{pageSize};
    </select>
@@ -856,7 +856,7 @@

        </where>

        order by fgi.id desc
        order by fgi.update_time desc
        limit #{offset},#{pageSize}
        ;
    </select>