Merge branch 'dev' into test

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

@@ -163,10 +163,12 @@ public class WmsActionGroupDetails extends BaseBean {
     public WmsActionGroupDetails() {
     }
 
-    public WmsActionGroupDetails(Long agId, Integer seq, Integer okSeq, Integer ngSeq, Integer valueType, Integer toUpper,
+    public WmsActionGroupDetails(Long id, Long agId, Integer seq, Integer okSeq, Integer ngSeq, Integer valueType, Integer toUpper,
                                  Integer lenCheck, String regularCheck, String regularCheckFailMsg, Long asId, Long atId,
                                  String asName, String atName, String goToBtnCode, String goToBtnName, Integer preShow,
-                                 Long showAmId, Integer isCommitAble, Integer isAutoOpenWindow, String searchKey, String groupKey) {
+                                 Long showAmId, Integer isCommitAble, Integer isAutoOpenWindow, String searchKey,
+                                 String groupKey, String organizeCode) {
+        this.id = id;
         this.agId = agId;
         this.seq = seq;
         this.okSeq = okSeq;
@@ -188,5 +190,6 @@ public class WmsActionGroupDetails extends BaseBean {
         this.isAutoOpenWindow = isAutoOpenWindow;
         this.searchKey = searchKey;
         this.groupKey = groupKey;
+        this.organizeCode = organizeCode;
     }
 }