Merge remote-tracking branch 'origin/dev_长治_祥雨远见' into dev_长治_祥雨远见

yuan

5 天以前 84b131de4a1deb526066fc0f7e7514ac43838bf8

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

@@ -40,5 +40,5 @@
    private String processRouteCode;

    @ApiModelProperty(value = "BOM的ID")
    private Long bomId;
    private Integer bomId;
}