From 60af4db0b445edbb2856f9bc7199a3e627d32db2 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 13 八月 2025 11:11:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xgmFlasrs2' into xgmFlasrs2
---
src/main/java/com/zy/asrs/entity/Order.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/Order.java b/src/main/java/com/zy/asrs/entity/Order.java
index 4b170de..6bca05b 100644
--- a/src/main/java/com/zy/asrs/entity/Order.java
+++ b/src/main/java/com/zy/asrs/entity/Order.java
@@ -367,6 +367,15 @@
}
return null;
}
+ public String getTemp$(){
+ if(!Cools.isEmpty(this.temp1)) {
+ return this.temp1;
+ }
+ if(!Cools.isEmpty(this.temp2)) {
+ return this.temp2;
+ }
+ return "";
+ }
public String getPayType$(){
if (null == this.payType){ return null; }
--
Gitblit v1.9.1