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

maven

2 天以前 ff00c0c9e31e0088933d6bd134ab1b31e8616eab

 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;