Merge remote-tracking branch 'origin/dev_New_pro' into dev_pro_河南鹤壁

jenkins

2026-05-21 798a2095478f5368377d0121fb17e991ed04c56c

 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;