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

yaowanxin

2 天以前 a0fa5fa2d82f659a4b3e4a285a1f8603cc93ba86

 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")