Merge remote-tracking branch 'origin/master'

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

@@ -92,9 +92,6 @@ public class SysUser extends BaseBean {
     @ApiParam(value ="用户类型（枚举，待定）" , example ="-1")
     private Integer userType;
 
-    @ApiParam(value ="用户信息")
-    private transient SysUserInfo userInfo;
-
     @ApiParam(value ="用户所有角色信息")
     private transient List<SysRole> roleList;
 

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

@@ -1,11 +1,9 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
-import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
-import javax.persistence.Entity;
 import java.util.List;
 
 /**
@@ -17,7 +15,7 @@ import java.util.List;
  **/
 @Data
 @Api("返回前端数据实体")
-public class WmsActionResponseBean extends BaseBean {
+public class WmsActionResponseBean {
 
     @ApiParam("进度")
     public Double percent;

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

@@ -1,16 +1,9 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
-import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.hibernate.annotations.DynamicInsert;
-import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
 import java.util.List;
 
 /**
@@ -22,7 +15,7 @@ import java.util.List;
  **/
 @Data
 @Api("接受前端数据实体")
-public class WmsOperationBean extends BaseBean {
+public class WmsOperationBean {
 
     @ApiParam("扫描内容")
     public String barCode;