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

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 : 仓库管理对象封装