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

yaowanxin

10 天以前 d4b9db2b8958355b9960d57088af9865bb2b2f0d

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

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

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