From 9af8c942ba5083b6953e7c51f20a1b820a71746f Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 18 八月 2025 21:12:00 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/XianNingChuXing into dev
---
DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java b/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java
index fbfcdac..a8d887a 100644
--- a/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java
+++ b/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java
@@ -48,7 +48,7 @@
private Integer historyNum;
@ApiModelProperty("订单总金额")
private Double orderMoney;
- @ApiModelProperty("支付方式（1=OK平台支付（线上支付），2=其他方式支付（线下支付））")
+ @ApiModelProperty("支付方式（1=线上计费，2=打表计费）")
private Integer payManner;
@ApiModelProperty("支付金额")
private Double payMoney;
--
Gitblit v1.7.1