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

zss

9 天以前 5ad54547dc97b76dc3d689b9499dec7364968235

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

@@ -28,8 +28,8 @@
    @TableId(value = "id", type = IdType.AUTO)
    private Long id;

    @Schema(description = "工艺路线工序表id")
    private Long technologyRoutingOperationId;
    @Schema(description = "生产工艺路线工序表id")
    private Long productionOrderRoutingOperationId;

    @Schema(description = "录入时间")
    @TableField(fill = FieldFill.INSERT)