From 8429b26635252973e325d020af1a4485a0bbfdb0 Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期三, 28 八月 2024 11:26:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zhang-content/src/main/java/com/ruoyi/domain/ZTravelBase.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZTravelBase.java b/zhang-content/src/main/java/com/ruoyi/domain/ZTravelBase.java
index e229f1f..18dc5fa 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZTravelBase.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZTravelBase.java
@@ -33,6 +33,12 @@
*/
private String feeId;
+ @Excel(name = "杞︽/鑸彮")
+ private String flight;
+
+ @Excel(name = "鍑鸿鏂瑰紡")
+ private String type;
+
/**
* 鍦扮偣
*/
--
Gitblit v1.9.1