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

gongchunyi

5 天以前 1414834d6aef22639f98299c489eca1d24cf9d59

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

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

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