From 11f82e16d5154a91a20e3434f45afe784e1b5023 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期日, 20 九月 2026 09:35:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_玮苓乐器' into dev_天津_玮苓乐器
---
src/main/java/com/ruoyi/production/pojo/ProductionCostingProcess.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionCostingDept.java b/src/main/java/com/ruoyi/production/pojo/ProductionCostingProcess.java
similarity index 65%
rename from src/main/java/com/ruoyi/production/pojo/ProductionCostingDept.java
rename to src/main/java/com/ruoyi/production/pojo/ProductionCostingProcess.java
index 3834304..a1f31a2 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionCostingDept.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionCostingProcess.java
@@ -12,12 +12,12 @@
import java.time.LocalDateTime;
/**
- * 鐢熶骇鏍哥畻-閮ㄩ棬绫诲瀷閰嶇疆锛堝尯鍒嗘垚鍝侀儴闂� / 鐧界洅閮ㄩ棬锛�
+ * 鐢熶骇鏍哥畻-宸ュ簭绫诲瀷閰嶇疆锛堢洿鎺ユ寚瀹氭煇涓伐搴忓睘浜庢垚鍝� / 鐧界洅锛�
*/
@Data
-@TableName("production_costing_dept")
-@Schema(name = "ProductionCostingDept瀵硅薄", description = "鐢熶骇鏍哥畻-閮ㄩ棬绫诲瀷閰嶇疆")
-public class ProductionCostingDept implements Serializable {
+@TableName("production_costing_process")
+@Schema(name = "ProductionCostingProcess瀵硅薄", description = "鐢熶骇鏍哥畻-宸ュ簭绫诲瀷閰嶇疆")
+public class ProductionCostingProcess implements Serializable {
private static final long serialVersionUID = 1L;
@@ -25,18 +25,18 @@
@Schema(description = "涓婚敭")
private Long id;
- @Schema(description = "閮ㄩ棬ID")
- private Long deptId;
+ @Schema(description = "宸ュ簭ID(technology_operation.id)")
+ private Long processId;
- @Schema(description = "閮ㄩ棬绫诲瀷锛�1鎴愬搧閮ㄩ棬锛�2鐧界洅閮ㄩ棬")
+ @Schema(description = "绫诲瀷锛�1鎴愬搧閮ㄩ棬锛�2鐧界洅閮ㄩ棬")
private Integer deptType;
@Schema(description = "澶囨敞")
private String remark;
- @Schema(description = "閮ㄩ棬鍚嶇О锛堥潪鏁版嵁搴撳瓧娈碉級")
+ @Schema(description = "宸ュ簭鍚嶇О锛堥潪鏁版嵁搴撳瓧娈碉級")
@TableField(exist = false)
- private String deptName;
+ private String processName;
@TableField(fill = FieldFill.INSERT)
private Long createUser;
--
Gitblit v1.9.3