Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

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

@@ -41,6 +41,9 @@ public class WmsActionResponseBean<Obj> implements Serializable {
     @ApiParam("总步数")
     public int totalStep;
 
+    @ApiParam("错误提示信息")
+    public String errorMsg;
+
     @ApiParam("提示信息")
     public String message;
 
@@ -49,14 +52,16 @@ public class WmsActionResponseBean<Obj> implements Serializable {
 
     @ApiParam("可选项")
     public List<WmsOptionModel> options;
-    public List<WmsOptionModel> getOptions(){
+
-        if(options == null){
+    public List<WmsOptionModel> getOptions() {
+        if (options == null) {
             options = new ArrayList<>();
         }
         return options;
     }
-    public void setOptions(List<WmsOptionModel> opt){
+
-        if(opt == null){
+    public void setOptions(List<WmsOptionModel> opt) {
+        if (opt == null) {
             opt = new ArrayList<>();
         }
         options = opt;