From 217f8ee47bb19f8e154d4012dbe232f0d7af3a3d Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 30 一月 2026 09:44:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New

---
 src/main/java/com/ruoyi/production/pojo/SalesLedgerProductionAccounting.java |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/ruoyi/production/pojo/SalesLedgerProductionAccounting.java b/src/main/java/com/ruoyi/production/pojo/SalesLedgerProductionAccounting.java
index 2959e4d..b410df7 100644
--- a/src/main/java/com/ruoyi/production/pojo/SalesLedgerProductionAccounting.java
+++ b/src/main/java/com/ruoyi/production/pojo/SalesLedgerProductionAccounting.java
@@ -72,11 +72,6 @@
     private LocalDate schedulingDate;
 
     /**
-     *
-     */
-    private Integer status;
-
-    /**
      * 鍒涘缓鑰�
      */
     @TableField(fill = FieldFill.INSERT)
@@ -106,4 +101,6 @@
     @TableField(fill = FieldFill.INSERT)
     private Long tenantId;
 
+    private Long ProductMainId;
+
 }

--
Gitblit v1.9.3