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

liyong

2026-02-09 23cb707e9d6b716c8a5f9c79956845cf8df523c7

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

@@ -23,24 +23,9 @@
    private Long id;

    /**
     * 销售排产-报工表id
     * 报工表id
     */
    private Long salesLedgerWorkId;

    /**
     * 销售排产表id
     */
    private Long salesLedgerSchedulingId;

    /**
     * 销售台账id
     */
    private Long salesLedgerId;

    /**
     * 销售产品id
     */
    private Long salesLedgerProductId;
    private Long productMainId;

    /**
     * 生产人id
@@ -101,6 +86,5 @@
    @TableField(fill = FieldFill.INSERT)
    private Long tenantId;

    private Long ProductMainId;

}