From db09851a594c60d7890cf5632a6f017e3adc85e3 Mon Sep 17 00:00:00 2001
From: Administrator <962239776@qq.com>
Date: Fri, 2 Nov 2018 19:21:25 +0800
Subject: [PATCH] Merge branch 'master' of
 http://git.estsh.com/i3-IMPP/i3plus-pojo

# Conflicts:
#	modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
---
 .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
index 3b75ad7..b952e70 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
@@ -1,8 +1,7 @@
 package cn.estsh.i3plus.pojo.wms.sqlpack;
 
 import cn.estsh.i3plus.pojo.base.tool.HqlPack;
-import cn.estsh.i3plus.pojo.wms.bean.InterfaceDevice;
-import cn.estsh.i3plus.pojo.wms.bean.WareHouse;
+import cn.estsh.i3plus.pojo.wms.bean.*;
 
 /**
  * @Description : 仓库管理对象封装