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"; /** * 发货方式
