解决冲突

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

@@ -8,6 +8,7 @@ import lombok.NoArgsConstructor;
 
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 /**
  * @Description : PDA传输到后台的实体bean对象
@@ -35,10 +36,10 @@ public class WmsActionResponseBean {
     public String message;
 
     @ApiParam("列表信息")
-    public List<String> informations;
+    public Set<String> informations;
 
     @ApiParam("可选项")
-    public List<String> options;
+    public Set<String> options;
 
     @ApiParam("选中的明细数据")
     public List<Map<String, Object>> details;
@@ -51,7 +52,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, Set<String> informations,  List<Map<String, Object>> details, Boolean codeStatus) {
         this.percent = percent;
         this.message = message;
         this.informations = informations;