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

gongchunyi

18 小时以前 da54b18e2934c39eb21e246aeda8baef9d1af933

 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;