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

zss

3 天以前 bb6d3de7c1758fc0e4d3e8e2f364c28b501e65b4

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