From ca81ac257960fcb135fe542a49c28bc871b14e2a Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 13 五月 2019 09:29:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master_develop

---
 fanli/src/main/java/com/yeshi/fanli/util/factory/AccountMessageFactory.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/util/factory/AccountMessageFactory.java b/fanli/src/main/java/com/yeshi/fanli/util/factory/AccountMessageFactory.java
index 511528c..33314ba 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/factory/AccountMessageFactory.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/factory/AccountMessageFactory.java
@@ -4,9 +4,9 @@
 import java.text.MessageFormat;
 import java.util.Map;
 
+import com.yeshi.fanli.dto.HongBao;
 import com.yeshi.fanli.entity.bus.user.AccountMessage;
 import com.yeshi.fanli.entity.bus.user.Extract;
-import com.yeshi.fanli.entity.bus.user.HongBao;
 import com.yeshi.fanli.entity.bus.user.UserInfo;
 import com.yeshi.fanli.util.Constant;
 import com.yeshi.fanli.util.PropertiesUtil;

--
Gitblit v1.8.0