From 2d03ec79e1892248b520cf097e8a58dd82a4892f Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 22 五月 2026 15:19:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印
---
src/main/java/com/ruoyi/production/pojo/SalesLedgerProductionAccounting.java | 30 ++++++++++++------------------
1 files changed, 12 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/pojo/SalesLedgerProductionAccounting.java b/src/main/java/com/ruoyi/production/pojo/SalesLedgerProductionAccounting.java
index b410df7..3bd97ca 100644
--- a/src/main/java/com/ruoyi/production/pojo/SalesLedgerProductionAccounting.java
+++ b/src/main/java/com/ruoyi/production/pojo/SalesLedgerProductionAccounting.java
@@ -1,6 +1,7 @@
package com.ruoyi.production.pojo;
import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Builder;
import lombok.Data;
@@ -23,24 +24,9 @@
private Long id;
/**
- * 閿�鍞帓浜�-鎶ュ伐琛╥d
+ * 鎶ュ伐琛╥d
*/
- private Long salesLedgerWorkId;
-
- /**
- * 閿�鍞帓浜ц〃id
- */
- private Long salesLedgerSchedulingId;
-
- /**
- * 閿�鍞彴璐d
- */
- private Long salesLedgerId;
-
- /**
- * 閿�鍞骇鍝乮d
- */
- private Long salesLedgerProductId;
+ private Long productMainId;
/**
* 鐢熶骇浜篿d
@@ -101,6 +87,14 @@
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
- private Long ProductMainId;
+
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
+ private Long deviceId;
+
+ @ApiModelProperty("宸ユ椂")
+ private Long workHour;
}
--
Gitblit v1.9.3