Merge branch 'master' into pim_meet

buhuazhen

8 天以前 47768d890fbfc1a5f3e93ca26137847361415e9e

 src/main/java/com/ruoyi/procurementrecord/dto/ProcurementRecordOutPageDto.java

@@ -14,6 +14,9 @@
@Data
public class ProcurementRecordOutPageDto {

    @Excel(name = "出库编号")
    private String code;

    private Integer id;

    /**