解决冲突

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ActionButlerModel.java

@@ -0,0 +1,28 @@
+package cn.estsh.i3plus.pojo.model.wms;
+
+import lombok.Data;
+
+/**
+ * @Description : 流程管家模型
+ * @Reference :
+ * @Author : silliter.yuan
+ * @CreateDate : 2018-11-28 15:50
+ * @Modify:
+ **/
+@Data
+public class ActionButlerModel {
+
+    private String orderNo;
+
+    private String sn;
+
+    private String aLId;
+
+    private String userNo;
+
+    private String fixNo;
+
+    private String barCode;
+
+    private String funCallName;
+}

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

@@ -5,7 +5,6 @@ import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import lombok.RequiredArgsConstructor;
 
 import java.util.List;
 import java.util.Map;

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

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -16,7 +17,7 @@ import java.util.Map;
  **/
 @Data
 @Api("接受前端数据实体")
-public class WmsOperationBean {
+public class WmsOperationBean extends BaseBean {
 
     @ApiParam("扫描内容")
     public String barCode;