From 615991ba24e3c646900000734954659fc1a2531c Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 24 六月 2025 15:38:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/taxi/TOrderTaxiController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/taxi/TOrderTaxiController.java b/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/taxi/TOrderTaxiController.java
index a75342f..1291846 100644
--- a/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/taxi/TOrderTaxiController.java
+++ b/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/taxi/TOrderTaxiController.java
@@ -117,7 +117,7 @@
model.addAttribute("driverMoney","");
}
}
- if(tOrderTaxi.get("payManner")!=null && tOrderTaxi.get("payManner").equals("1")){
+ if(tOrderTaxi.get("payManner")!=null && Integer.parseInt(tOrderTaxi.get("payManner").toString()) == 1){
model.addAttribute("payMannerStr","线上收款");
}else {
model.addAttribute("payMannerStr","计费打表");
--
Gitblit v1.7.1