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

zss

18 小时以前 6ed4b397bb9dbb9c2d7bb0676339721fa97996bf

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

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

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

    /**
     * 工艺路线id
     * 模版的工艺路线id
     */
    @ApiModelProperty(value = "工艺路线id")
    private Long routeId;