From b77406b1e0b065dfcdaee1e3128dd17e62cd54a6 Mon Sep 17 00:00:00 2001
From: Silliter <sliter.yuan@estsh.com>
Date: Wed, 28 Nov 2018 16:26:04 +0800
Subject: [PATCH] Merge branch 'master' of
 http://git.estsh.com/i3-IMPP/i3plus-wms

# Conflicts:
#	modules/i3plus-wms-apiservice/src/main/java/cn/estsh/i3plus/wms/apiservice/serviceimpl/components/ScanOrderNoService.java
---
 .../java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java
index 9a7aca3..3e6c163 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java
@@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.wms.bean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import lombok.RequiredArgsConstructor;
 
 import java.util.List;
@@ -16,6 +17,7 @@ import java.util.Map;
  * @Modify:
  **/
 @Data
+@NoArgsConstructor
 @Api("返回前端数据实体")
 public class WmsActionResponseBean {
 
@@ -43,7 +45,7 @@ public class WmsActionResponseBean {
     @ApiParam(value = "结果代码")
     public boolean codeStatus;
 
-    private WmsActionResponseBean(boolean codeStatus, String message) {
+    public WmsActionResponseBean(boolean codeStatus, String message) {
         this.codeStatus = codeStatus;
         this.message = message;
     }