From 17638d2eba38eb0d9d98e899374b5db5d474b819 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期五, 22 十一月 2024 14:08:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
billion-main/src/main/java/com/billion/main/om/domain/OmProductionOrderInfo.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/billion-main/src/main/java/com/billion/main/om/domain/OmProductionOrderInfo.java b/billion-main/src/main/java/com/billion/main/om/domain/OmProductionOrderInfo.java
index 6857122..6a60569 100644
--- a/billion-main/src/main/java/com/billion/main/om/domain/OmProductionOrderInfo.java
+++ b/billion-main/src/main/java/com/billion/main/om/domain/OmProductionOrderInfo.java
@@ -47,7 +47,7 @@
private Date planEndTime;
/** 宸ュ崟鐘舵�侊紙1鏈紑濮�2鐢熶骇涓�3宸插畬鎴�4宸插叧闂級 */
- @Excel(name = "宸ュ崟鐘舵��", readConverterExp = "1=鏈紑濮�2鐢熶骇涓�3宸插畬鎴�4宸插叧闂�")
+ @Excel(name = "宸ュ崟鐘舵��", readConverterExp = "1=鏈紑濮�,2=鐢熶骇涓�,3=宸插畬鎴�,4=宸插叧闂�")
private String orderStatus;
/** 澶囨敞 */
--
Gitblit v1.9.3