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

gongchunyi

昨天 d80c1fe5bc2b604a27c2e985ea7593ba6618cc37

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

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

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

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

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