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

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;

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")