From 79d5e91444eca538d523d3bd014528abd939da33 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 14 八月 2025 18:54:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderExport.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderExport.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderExport.java
index e873738..dbefc91 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderExport.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderExport.java
@@ -59,8 +59,9 @@
*/
@Excel(name = "商品售价")
private BigDecimal sellingPrice;
+
@Excel(name = "支付方式",readConverterExp ="1=微信,2=账户余额,3=积分,4=组合")
- private Integer pay_method;
+ private String payMethod;
/**
* 支付金额
*/
@@ -71,11 +72,9 @@
private String point;
private String goodJson;
- /**
- * 商户号
- */
+
@Excel(name = "商户号")
- private String tradeMerchantNo = "729677708";
+ private String tradeMerchantNo = "1717539630";
/**
* 发货方式
--
Gitblit v1.7.1