Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印

liyong

3 天以前 8a71194e0cd81a39637bc9c5adbd8c9d1405f155

 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},'%')