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

liyong

6 天以前 41b6d0c9c00b24534a90bbd4cdeb0537cb889c67

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

@@ -34,7 +34,7 @@
    private Long productModelId;

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