冲突

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

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.model.wms.OptionModel;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
@@ -10,7 +11,6 @@ import lombok.NoArgsConstructor;
 
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 /**
  * @Description : PDA传输到后台的实体bean对象
@@ -41,7 +41,7 @@ public class WmsActionResponseBean {
     public List<String> informations;
 
     @ApiParam("可选项")
-    public Map<String, Boolean> options;
+    public List<OptionModel> options;
 
     @ApiParam("选中的明细数据")
     public List<Map<String, Object>> details;
@@ -58,7 +58,7 @@ public class WmsActionResponseBean {
         this.message = message;
     }
 
-    public WmsActionResponseBean(Double percent, String message, List<String> informations,  List<Map<String, Object>> details, Boolean codeStatus) {
+    public WmsActionResponseBean(Double percent, String message, List<String> informations, List<Map<String, Object>> details, Boolean codeStatus) {
         this.percent = percent;
         this.message = message;
         this.informations = informations;