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

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

@@ -24,18 +24,17 @@ import javax.persistence.Transient;
  **/
 @Data
 @Entity
-@Table(name="WMS_ACTION_STEP_CALL_PARAM")
+@Table(name = "WMS_ACTION_STEP_CALL_PARAM")
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Api(value="作业步骤调用参数表",description = "作业步骤调用参数表")
+@Api(value = "作业步骤调用参数表", description = "作业步骤调用参数表")
 public class WmsActionStepCallParam extends BaseBean {
 
     private static final long serialVersionUID = -2813779192436803301L;
     @Column(name = "AGD_ID")
     @ApiParam(value = "流程明细编号")
     @JsonSerialize(using = ToStringSerializer.class)
-
     private Long agdId;
 
     @Column(name = "SEQ")
@@ -59,4 +58,15 @@ public class WmsActionStepCallParam extends BaseBean {
     @ApiParam(value = "组件名称")
     private String amName;
 
+    @Transient
+    @ApiParam(value = "流程ID")
+    private Long agId;
+
+    public WmsActionStepCallParam() {
+    }
+
+    public WmsActionStepCallParam(Long id, Long agId) {
+        this.id = id;
+        this.agId = agId;
+    }
 }