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

liyong

5 天以前 2cc19f8033348f34df382d27f63810b2d6f56a05

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

@@ -51,7 +51,7 @@
    private LocalDateTime updateTime;

    @ApiModelProperty("关联bom的id")
    private Long bomId;
    private Integer bomId;

    @ApiModelProperty("工艺路线编码")
    private String processRouteCode;