Merge remote-tracking branch 'origin/dev' into dev

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java

@@ -1740,7 +1740,8 @@ public class WmsEnumUtil {
 
         INTERACTIVE_ACTION(10, "交互动作"),
         BACKSTAGE_ACTION(20, "后台动作"),
-        SUBMIT_ACTION(30, "提交动作");
+        SUBMIT_ACTION(30, "提交动作"),
+        SELECT_ACTION(40, "选择动作");
 
         private int value;
         private String description;

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTableRow.java

@@ -18,6 +18,10 @@ import java.util.Map;
 @Data
 public class DynTableRow {
 
+    // 是否选中
+    private boolean isChecked;
+
+    // 行ID
     private String key;
 
     // 行号

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

@@ -101,4 +101,13 @@ public class WmsActionLogDetails extends BaseBean {
     @ApiParam(value = "结束执行时间")
     public String endTime;
 
+    public WmsActionLogDetails() {
+
+    }
+
+    public WmsActionLogDetails(String createUser, Long id, Integer seq) {
+        this.createUser = createUser;
+        this.id = id;
+        this.seq = seq;
+    }
 }