Merge remote-tracking branch 'origin/dev_长治_祥雨远见' into dev_长治_祥雨远见

gongchunyi

5 天以前 9f5813763a54f7fde8b472b0da305d635a624e8f

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

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