Merge remote-tracking branch 'origin/pim-jlmy' into pim-jlmy

yaowanxin

2 天以前 ca788dcbd73c5c8665b45da7ff4a0b1d92196b2c

 main-business/src/main/java/com/ruoyi/business/dto/PendingInventoryDto.java

@@ -35,6 +35,6 @@

    private List<Map<String, Object>> coalResultList;//配煤计算器煤种信息list

    private List<Map<String, Object>> fieldsResultList;//配煤计算器方案字段信息list
    private Map<String, Object> fieldsResultList;//配煤计算器方案字段信息list

}