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

zss

9 天以前 d406310fa4d79e99b825a3698ee60af2991c261c

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

@@ -48,8 +48,11 @@
    @Schema(description = "工艺路线编码")
    private String processRouteCode;

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

    @Schema(description = "订单bom的id")
    private Long orderBomId;

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