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/OmOrderScheduling.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/billion-main/src/main/java/com/billion/main/om/domain/OmOrderScheduling.java b/billion-main/src/main/java/com/billion/main/om/domain/OmOrderScheduling.java
index 5280618..50b16b4 100644
--- a/billion-main/src/main/java/com/billion/main/om/domain/OmOrderScheduling.java
+++ b/billion-main/src/main/java/com/billion/main/om/domain/OmOrderScheduling.java
@@ -44,11 +44,11 @@
private Date offlineTime;
/** 璐ㄩ噺鐘舵��(1鍚堟牸锛�2涓嶅悎鏍�) */
- @Excel(name = "璐ㄩ噺鐘舵��(1鍚堟牸锛�2涓嶅悎鏍�)")
+ @Excel(name = "璐ㄩ噺鐘舵��(1鍚堟牸锛�2涓嶅悎鏍�)", readConverterExp = "1=鍚堟牸,2=涓嶅悎鏍�")
private String qualityStatus;
/** 鐘舵��(1鏈紑濮嬶紝2鎵ц涓紝3宸插畬鎴�) */
- @Excel(name = "鐘舵��(1鏈紑濮嬶紝2鎵ц涓紝3宸插畬鎴�)")
+ @Excel(name = "鐘舵��(1鏈紑濮嬶紝2鎵ц涓紝3宸插畬鎴�)", readConverterExp = "1=鏈紑濮�,2=鎵ц涓�,3=宸插畬鎴�")
private String status;
/** 澶囨敞 */
--
Gitblit v1.9.3