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

zss

3 天以前 1942fb9f1a4dd6a90daca24e3a093c138e0e48c3

 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)