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

maven

2 天以前 4275b293cfc7779a20ccea30b2f773aff0fe06db

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

@@ -42,6 +42,12 @@
     */
    @TableField(value = "production_quantity")
    private BigDecimal productionQuantity;

    /**
     * 待排产数量
     */
    @TableField(value = "pending_quantity")
    private BigDecimal pendingQuantity;
    /**
     * 人工成本
     */