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

buhuazhen

2 天以前 392366ea36a839e5d0ea05968e6da31cd53a9ee6

 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")
@@ -95,6 +100,11 @@
    @TableField(value = "coal_plan_id")
    private Long coalPlanId;
    /**
     * 采购类型
     */
    @TableField(value = "purchase_type")
    private Integer purchaseType;
    /**
     * 登记日期
     */
    @TableField(value = "registration_date")