Merge branch 'dev_New' into dev_宁夏_中盛建材

zss

8 天以前 43113d6b1670530dfb4348836fd491c79f36af0a

 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;

    /**