From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/util/HongBaoUtil.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/HongBaoUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/HongBaoUtil.java
index f8807c8..745e67a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/HongBaoUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/HongBaoUtil.java
@@ -7,14 +7,15 @@
import java.util.List;
import java.util.Map;
+import org.yeshi.utils.JsonUtil;
+
import com.yeshi.fanli.dto.HongBao;
+import com.yeshi.fanli.dto.order.OrderItem;
import com.yeshi.fanli.entity.bus.user.HongBaoExtra;
-import com.yeshi.fanli.entity.bus.user.OrderItem;
import com.yeshi.fanli.entity.taobao.OrderItemHongBao;
import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
import com.yeshi.fanli.entity.taobao.TaobaoOrderHongBao;
import com.yeshi.fanli.log.LogHelper;
-import org.yeshi.utils.JsonUtil;
public class HongBaoUtil {
--
Gitblit v1.8.0