From 248aa38c12a393d12c5ab721ee75fbd5c7dfbb9f Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期四, 18 四月 2019 12:31:28 +0800
Subject: [PATCH] Merge branch 'div'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
index 054265e..15b4f23 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
@@ -249,7 +249,7 @@
totalSettlement = commonOrder.getTotalPayment();
}
// 瀹炰粯娆�
- commonGoodsVO.setActualPay("瀹炰粯娆撅細楼" + totalSettlement);
+ commonGoodsVO.setActualPay("浠樻閲戦锛毬�" + totalSettlement);
listOrderGoods.add(commonGoodsVO);
@@ -888,7 +888,7 @@
totalSettlement = commonOrder.getTotalPayment();
}
// 瀹炰粯娆�
- commonGoodsVO.setActualPay("瀹炰粯娆撅細楼" + totalSettlement);
+ commonGoodsVO.setActualPay("浠樻閲戦锛毬�" + totalSettlement);
listOrderGoods.add(commonGoodsVO);
--
Gitblit v1.8.0