Merge remote-tracking branch 'origin/dev_New_pro' into dev_鹤壁_强信宇_pro

yuan

2026-05-13 7a48e6173335559b181b2097867f1166233b8117

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

@@ -14,9 +14,6 @@
    @TableId(type = IdType.AUTO)
    private Long id;

    @Schema(description = "报工id")
    private Long productMainId;

    @Schema(description = "生产报工主表id")
    private Long productionProductMainId;