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

zss

9 天以前 3e5315bf1913ec325697f22104fcd2758c98891a

 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;