From 46b2ee5f0d9fc6ffaffee1f9de3f4f56d63355b4 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 13 三月 2026 13:31:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材
---
src/main/java/com/ruoyi/productionPlan/pojo/ProductionPlan.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/productionPlan/pojo/ProductionPlan.java b/src/main/java/com/ruoyi/productionPlan/pojo/ProductionPlan.java
index fc9b30f..72866c7 100644
--- a/src/main/java/com/ruoyi/productionPlan/pojo/ProductionPlan.java
+++ b/src/main/java/com/ruoyi/productionPlan/pojo/ProductionPlan.java
@@ -62,7 +62,7 @@
* 鍏宠仈鐗╂枡淇℃伅琛↖D
*/
@ApiModelProperty("鍏宠仈鐗╂枡淇℃伅琛↖D")
- private Integer productMaterialId;
+ private Long productMaterialSkuId;
/**
* 闀�
@@ -105,6 +105,10 @@
@ApiModelProperty("寮哄害")
@Excel(name = "寮哄害")
private String strength;
+
+ @ApiModelProperty("鐘舵�� 0鏈笅鍙� 1閮ㄥ垎涓嬪彂 2宸蹭笅鍙�")
+ @Excel(name = "鐘舵��", readConverterExp = "0=鏈笅鍙�,1=閮ㄥ垎涓嬪彂,2=宸蹭笅鍙�")
+ private Integer status;
/**
* 寮�濮嬫棩鏈�
@@ -180,16 +184,11 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime formModifiedTime;
- /**
- * 鏁版嵁鍚屾绫诲瀷锛�1=鎵嬪姩 2=瀹氭椂浠诲姟
- */
- @ApiModelProperty("鏁版嵁鍚屾绫诲瀷锛�1=鎵嬪姩 2=瀹氭椂浠诲姟")
- private Integer dataSyncType;
/**
- * 鏁版嵁鏉ユ簮绫诲瀷锛�1=鍚屾 2=鏂板
+ * 鏁版嵁鏉ユ簮绫诲瀷锛�1=閽夐拤鍚屾 2=鎵嬪姩鏂板
*/
- @ApiModelProperty("鏁版嵁鏉ユ簮绫诲瀷锛�1=鍚屾 2=鏂板")
+ @ApiModelProperty("鏁版嵁鏉ユ簮绫诲瀷锛�1=閽夐拤鍚屾 2=鎵嬪姩鏂板")
private Integer dataSourceType;
/**
--
Gitblit v1.9.3