Merge remote-tracking branch 'origin/dev_New_pro' into dev_宁夏_英泽防锈

liyong

5 天以前 f57064d2fa563ee4cfeeccd715850ba8b8aa4f60

 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;