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

liyong

15 小时以前 1765150bd38a53f6466a6e355f231e21f25fc9f2

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

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

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