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

liyong

9 天以前 a5d7ef82a926d72651bb35779a59883528a9d641

 src/main/java/com/ruoyi/inspectiontask/dto/QrCodeScanRecordDto.java

@@ -1,7 +1,7 @@
package com.ruoyi.inspectiontask.dto;


import com.ruoyi.basic.dto.StorageBlobDTO;
import com.ruoyi.basic.dto.StorageBlobVO;
import com.ruoyi.inspectiontask.pojo.QrCode;
import com.ruoyi.inspectiontask.pojo.QrCodeScanRecord;
import lombok.Data;
@@ -15,6 +15,6 @@

    private String scanner;

    private List<StorageBlobDTO> storageBlobDTO;
    private List<StorageBlobVO> storageBlobVO;

}