解决冲突

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

@@ -39,7 +39,7 @@ public class WmsActionResponseBean {
     public Set<String> informations;
 
     @ApiParam("可选项")
-    public Set<String> options;
+    public Map<String, Boolean> options;
 
     @ApiParam("选中的明细数据")
     public List<Map<String, Object>> details;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -1158,6 +1158,8 @@ public class WmsHqlPack {
 
         //作业流程id（对应作业记录明细里自增的id）
         HqlPack.getNumEqualPack(wmsActionLogDetails.getAlId(),"alId",result);
+        HqlPack.getNumEqualPack(wmsActionLogDetails.getSeq(),"seq",result);
+
         getStringBuilderPack(wmsActionLogDetails, result);
 
         return  result.toString();