解决冲突

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

@@ -26,6 +26,9 @@ import java.util.Map;
 @Api("返回前端数据实体")
 public class WmsActionResponseBean<Obj> {
 
+    @ApiParam("回显BARCODE值")
+    public Map<String, Obj> barCode;
+
     @ApiParam("进度")
     public String percent;
 
@@ -59,7 +62,7 @@ public class WmsActionResponseBean<Obj> {
      * 就把detailsData的内容以List的格式显示到 列表提示区域
      */
     @ApiParam(value = "是否需要选择单号")
-    public Boolean toSelected;
+    public Boolean toSelected = false;
 
     /**
      * 与 toSelected 属性配合使用，

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

@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description : PDA传输到后台的实体bean对象
@@ -17,13 +18,13 @@ import java.util.List;
  **/
 @Data
 @Api("接受前端数据实体")
-public class WmsOperationBean extends BaseBean {
+public class WmsOperationBean<Obj> extends BaseBean {
 
     @ApiParam("扫描内容")
     public String barCode;
 
     @ApiParam("可选项的值")
-    public List<OptionModel> options;
+    public List<Obj> options;
 
     @ApiParam("设备编号")
     public String fixNo;