Merge branch 'jtwy' into dev_New

zss

20 小时以前 1493f69da9d12415085c9be7937d4f394c5fb154

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

@@ -14,7 +14,10 @@
    private Long id;

    @ApiModelProperty(value = "生产订单id(product_order_id)")
    private Long routeId;
    private Long productOrderId;

    @ApiModelProperty(value = "生产订单的工艺路线id(product_process_route)")
    private Long productRouteId;

    @ApiModelProperty(value = "工序id")
    private Long processId;