From 20cdd4170c32f3c9ec85ab4970ff2669ff864a78 Mon Sep 17 00:00:00 2001
From: amy <962239776@qq.com>
Date: Thu, 27 Dec 2018 11:59:03 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=9B=98=E7=82=B9=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E5=AE=9E=E4=BD=93=E6=9E=9A=E4=B8=BE=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java
index cfefd6b..a450d3f 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java
@@ -41,7 +41,7 @@ public class WmsCSOrderMaster extends BaseBean {
     public Integer orderType;
 
     @Column(name="ORDER_STATUS")
-    @ApiParam(value = "状态", example = "1" )
+    @ApiParam(value = "状态 (1-创建 10-已冻结 20-盘点中  30-盘点完成  40-已解冻  50-已关闭)", example = "1" )
     public Integer orderStatus;
 
     @Column(name="ACTION_PERSENT")

From b8d4a3a08a442905c5d8cdf2e9e7fe6121fe2592 Mon Sep 17 00:00:00 2001
From: Silliter <sliter.yuan@estsh.com>
Date: Fri, 28 Dec 2018 15:05:03 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=AE=A1=E5=AE=B6?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
index 58a362e..a6a91f7 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
@@ -1554,7 +1554,8 @@ public class WmsEnumUtil {
         RESET(30, "重置按钮"),
         CHECK_DETAILS(40, "查看明细"),
         DELETE_DETAILS(50, "明细(删除)"),
-        CLEAR_DETAILS(60, "明细（清空）");
+        CLEAR_DETAILS(60, "明细（清空）"),
+        CUSTOM_BUTTON(70, "自定义按钮");
 
         private int value;
         private String description;