From 8d84ca36593e33de7e0b604824c471db3587fdb4 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期五, 17 一月 2020 16:53:46 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ElmeController.java |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ElmeController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ElmeController.java
index 276ad66..661a30b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ElmeController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ElmeController.java
@@ -11,13 +11,11 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.yeshi.utils.JsonUtil;
 
-import com.aliyuncs.unmarshaller.JsonUnmashaller;
 import com.yeshi.fanli.entity.accept.AcceptData;
 import com.yeshi.fanli.entity.bus.user.HongBaoV2;
 import com.yeshi.fanli.entity.elme.ElmeHongBaoOrderMap;
 import com.yeshi.fanli.entity.elme.ElmeOrder;
 import com.yeshi.fanli.service.inter.elme.ElmeHongBaoOrderMapService;
-import com.yeshi.fanli.util.Constant;
 import com.yeshi.fanli.util.StringUtil;
 import com.yeshi.fanli.util.TimeUtil;
 import com.yeshi.fanli.vo.elme.ElmeUserOrderVO;

--
Gitblit v1.8.0