Merge branch 'jtwy' into dev_New

zss

20 小时以前 2757f1d46f388f684aad93b3dc7ad805c45c6248

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

@@ -13,7 +13,7 @@
    @TableId(type = IdType.AUTO)
    private Long id;

    @ApiModelProperty(value = "工艺路线id")
    @ApiModelProperty(value = "生产订单id(product_order_id)")
    private Long routeId;

    @ApiModelProperty(value = "工序id")