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

yaowanxin

昨天 ca788dcbd73c5c8665b45da7ff4a0b1d92196b2c

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

@@ -76,10 +76,22 @@
     * 生产人ID
     */
    @TableField(value = "producer_id")
    private String producerId;
    private Long producerId;
    /**
     * 生产日期
     */
    @TableField(value = "production_date")
    private LocalDate productionDate;

    /**
     * 煤料类型(1-成品 2-原料)
     */
    @TableField(value = "type")
    private Integer type;

    /**
     * 状态（1-待排产 2-排产中 3-已排产）
     */
    @TableField(value = "status")
    private Integer status;
}