Merge remote-tracking branch 'origin/dev_New' into dev_New

liyong

9 天以前 408bab8b1c0c10514b8395cff92e47751e4dcdcd

 src/main/java/com/ruoyi/production/pojo/ProductOrder.java

@@ -30,12 +30,13 @@
    /**
     * 销售台账产品id(sales_ledger_product)
     */
    @ApiModelProperty(value = "销售台账产品id")
    private Long saleLedgerProductId;

    /**
     * 销售台账产品id(sales_ledger_product)
     * 产品规格id
     */
    @ApiModelProperty(value = "销售台账产品id")
    @ApiModelProperty(value = "产品规格id")
    private Long productModelId;

    /**