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

云

8 天以前 39e6d6469b652daaf4af66b8b75f8dad2f95923c

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

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

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

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