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

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.base.bean.BaseResultBean;
 import cn.estsh.i3plus.pojo.model.wms.OptionModel;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -23,7 +24,7 @@ import java.util.Map;
 @NoArgsConstructor
 @AllArgsConstructor
 @Api("返回前端数据实体")
-public class WmsActionResponseBean {
+public class WmsActionResponseBean<Obj> {
 
     @ApiParam("进度")
     public Double percent;
@@ -44,7 +45,7 @@ public class WmsActionResponseBean {
     public List<OptionModel> options;
 
     @ApiParam("选中的明细数据")
-    public List<Map<String, Object>> details;
+    public Obj details;
 
     @ApiParam(value = "结果代码")
     public Boolean codeStatus;
@@ -72,11 +73,12 @@ 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, Obj details, Boolean codeStatus) {
         this.percent = percent;
         this.message = message;
         this.informations = informations;
         this.details = details;
         this.codeStatus = codeStatus;
     }
+
 }