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

liyong

10 小时以前 168b0d2b658fffb2cf3fd1cf569a6c7b25c36a47

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

@@ -21,7 +21,8 @@
                dr.update_user,
               dr.tenant_id,
               dl.device_name,
               dl.device_model
               dl.device_model,
               dr.spare_parts_ids
        from device_repair dr
        left join device_ledger dl on dr.device_ledger_id = dl.id
        <where>
@@ -32,6 +33,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>