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

maven

2 天以前 4275b293cfc7779a20ccea30b2f773aff0fe06db

 main-business/src/main/java/com/ruoyi/business/entity/PendingInventory.java

@@ -55,6 +55,11 @@
    @TableField(value = "coal_id")
    private Long coalId;
    /**
     * 煤料类型 1-成品 2-原料
     */
    @TableField(value = "type")
    private Integer type;
    /**
     * 单位
     */
    @TableField(value = "unit")