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

云

8 天以前 0cb3eeb5b498f063f890b164d26ab9a0d0d79a1c

 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;