Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

云

16 小时以前 3d556b8defe1ff5b9aeb481bd1d0a67b2ded0192

 src/main/resources/mapper/measuringinstrumentledger/SparePartsMapper.xml

@@ -10,5 +10,6 @@
                and sp.name like concat('%',#{spareParts.name},'%')
            </if>
        </where>
        order by sp.create_time desc
    </select>
</mapper>
</mapper>