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

zss

昨天 e595c86c223563a178b9bb0d0dcb8b0c3c3771c0

 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>