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

liyong

昨天 217f8ee47bb19f8e154d4012dbe232f0d7af3a3d

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

@@ -30,6 +30,11 @@
    /**
     * 销售台账产品id(sales_ledger_product)
     */
    private Long saleLedgerProductId;

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