main-business/src/main/java/com/ruoyi/business/dto/OfficialInventoryDto.java
@@ -1,5 +1,6 @@ package com.ruoyi.business.dto; import com.ruoyi.basic.entity.CoalValue; import com.ruoyi.business.entity.OfficialInventory; import lombok.Data; @@ -13,8 +14,19 @@ private List<Long> ids;//要合并的正式库的id private Integer type; private String coal; //煤种 private String supplierName; //供应商 private String registrant; //登记人 private String supplierCoal; //供应商 + 煤种 private List<Map<String, String>> coalValues; //媒质方案字段值 private List<Long> exportIds;//导出选中的id }