Merge branch 'jtwy' of http://114.132.189.42:9002/r/product-inventory-manag...

liyong

10 天以前 a08dce3de307ce138396db5fe7274ead2ef5c573

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

@@ -14,11 +14,13 @@
                dr.maintenance_name,
                dr.maintenance_time,
                dr.maintenance_result,
                dr.maintenance_price,
                dr.status,
                dr.create_time,
                dr.update_time,
                dr.create_user,
                dr.update_user,
               dr.repair_price,
               dr.tenant_id,
               dl.device_name,
               dl.device_model
@@ -33,7 +35,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},'%')
@@ -59,6 +61,7 @@
               dr.maintenance_name,
               dr.maintenance_time,
               dr.maintenance_result,
               dr.maintenance_price,
               dr.status,
               dr.create_time,
               dr.update_time,