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

chenlu

2024-12-05 a7cc9c3be58bccd868bc8c12ed57c2b90fedc6b8

 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>