From 70a0aed5a22fbdbb486351258535944b5dae2a79 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 17 四月 2019 11:58:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java
index 48dde63..eb972a2 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java
@@ -984,7 +984,6 @@
 				e1.printStackTrace();
 			}
 		}
-
 	}
 
 }

--
Gitblit v1.8.0