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

zss

3 天以前 d5d089eff99cd51695697679a95445b6b5b0d205

 src/main/java/com/ruoyi/technology/pojo/TechnologyRouting.java

@@ -43,7 +43,7 @@
    private String processRouteCode;

    @Schema(description = "关联bom的id")
    private Integer bomId;
    private Long bomId;

    @Schema(description = "创建人ID")
    @TableField(fill = FieldFill.INSERT)