From b8d9a7cd20dfbaa3c0cc08f3c27e4addd8774e95 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Tue, 20 Jul 2021 15:35:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop

---
 zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java
index bf08c30..f74dc3c 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java
@@ -1550,7 +1550,7 @@
         sourceOrder.setIsHasRefund(SysOrder.IS_HAS_REFUND_Y);
 //        sourceOrder.setStatu(Dictionary.ORDER_STATU_TK);
         sysOrderDao.update(sourceOrder);
-        SysOrder oldOrder=sysOrderDao.selectById(   sysOrder.getOldOrderId());
+        SysOrder oldOrder=sysOrderDao.selectById(sysOrder.getOldOrderId());
 
         sysOrder.setId(null);
         sysOrder.setStaffId(user.getSuId());

--
Gitblit v1.9.1