From f05fd2a067d751333f00a81dad095a7650900c95 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 13 三月 2026 13:16:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材
---
src/main/java/com/ruoyi/productionPlan/pojo/ProductionPlan.java | 34 ++++++----------------------------
1 files changed, 6 insertions(+), 28 deletions(-)
diff --git a/src/main/java/com/ruoyi/productionPlan/pojo/ProductionPlan.java b/src/main/java/com/ruoyi/productionPlan/pojo/ProductionPlan.java
index 30e5f17..72866c7 100644
--- a/src/main/java/com/ruoyi/productionPlan/pojo/ProductionPlan.java
+++ b/src/main/java/com/ruoyi/productionPlan/pojo/ProductionPlan.java
@@ -59,27 +59,6 @@
private String customerName;
/**
- * 鐗╂枡缂栫爜
- */
- @ApiModelProperty("鐗╂枡缂栫爜")
- @Excel(name = "鐗╂枡缂栫爜")
- private String materialCode;
-
- /**
- * 浜у搧鍚嶇О
- */
- @ApiModelProperty("浜у搧鍚嶇О")
- @Excel(name = "浜у搧鍚嶇О")
- private String productName;
-
- /**
- * 浜у搧瑙勬牸
- */
- @ApiModelProperty("浜у搧瑙勬牸")
- @Excel(name = "浜у搧瑙勬牸")
- private String productSpec;
-
- /**
* 鍏宠仈鐗╂枡淇℃伅琛↖D
*/
@ApiModelProperty("鍏宠仈鐗╂枡淇℃伅琛↖D")
@@ -126,6 +105,10 @@
@ApiModelProperty("寮哄害")
@Excel(name = "寮哄害")
private String strength;
+
+ @ApiModelProperty("鐘舵�� 0鏈笅鍙� 1閮ㄥ垎涓嬪彂 2宸蹭笅鍙�")
+ @Excel(name = "鐘舵��", readConverterExp = "0=鏈笅鍙�,1=閮ㄥ垎涓嬪彂,2=宸蹭笅鍙�")
+ private Integer status;
/**
* 寮�濮嬫棩鏈�
@@ -201,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