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

zss

5 天以前 94e23a3d587846f10ea9517bd2e6705093d6a99a

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