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

zss

4 天以前 7a9bd9b7da7c4943e8b5853d4d7de5cba72f3de0

 src/main/resources/mapper/device/DeviceRepairMapper.xml

@@ -32,6 +32,9 @@
            <if test="deviceRepairDto.deviceModel != null">
                and dl.device_model like concat('%',#{deviceRepairDto.deviceModel},'%')
            </if>
            <if test="deviceRepairDto.status != null">
                and dr.status = #{deviceRepairDto.status}
            </if>
            <if test="deviceRepairDto.remark != null">
                and dr.remark like concat('%',#{deviceRepairDto.remark},'%')
            </if>