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

gongchunyi

8 天以前 a10faaa8d2a80f0302c35a5d73dcb7b3fb069133

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

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

    /**
     * 产品规格id
     */
    @ApiModelProperty(value = "产品规格id")
    private Long productModelId;

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