Merge remote-tracking branch 'origin/master' into pim-qiao

青城

9 天以前 5c5fc86ebb905d5c0d09caef3d80f38b2aba6f18

 src/main/java/com/ruoyi/purchase/dto/ProductRecordDto.java

@@ -1,5 +1,6 @@
package com.ruoyi.purchase.dto;

import com.ruoyi.other.pojo.TempFile;
import com.ruoyi.purchase.pojo.ProductRecord;
import com.ruoyi.sales.pojo.CommonFile;
import lombok.Data;
@@ -30,4 +31,6 @@
    private String unTicketsPrice = "0";

    private List<CommonFile> commonFiles;

    private List<String> tempFileIds;
}