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

liding

7 天以前 1d915922d8197aa5d5dc3e40e3088d983dd6e141

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

@@ -11,4 +11,9 @@
            </if>
        </where>
    </select>
    <select id="getByDeviceId" resultType="com.ruoyi.measuringinstrumentledger.dto.SparePartsDto">
        SELECT * FROM spare_parts
        WHERE status = '正常'
          AND FIND_IN_SET(#{id}, device_ids) > 0
    </select>
</mapper>