Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java

@@ -118,6 +118,12 @@ public class SysUserInfo extends BaseBean {
     @ApiParam(value ="用户所有岗位信息")
     private transient List<SysPosition> positionList;
 
+    @ApiParam(value ="用户所有组织信息")
+    private transient List<SysOrganize> organizeList;
+
+    @ApiParam(value ="用户岗位信息")
+    private transient SysDepartment department;
+
     @ApiParam(value ="用户组织信息")
     private transient SysOrganize organize;
 

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java

@@ -34,7 +34,7 @@ public class WmsMoveSn extends BaseBean {
 
     @Column(name="ITEM")
     @ApiParam("行号")
-    public String item;
+    public Integer item;
 
     @Column(name="PART_NO")
     @ApiParam("物料编码")