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

buhuazhen

2 天以前 392366ea36a839e5d0ea05968e6da31cd53a9ee6

 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;
    /**
     * 人工成本
     */