解决冲突

7 years ago · cb395f077e
parent 61b16569a4
commit cb395f077e
1 changed files with 6 additions and 0 deletions
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java
@ -25,6 +25,12 @@ public class WmsOperationBean extends BaseBean {
    @ApiParam("可选项的值")
    public List<String> options;

+    @ApiParam("设备编号")
+    public String fixNo;
+
+    @ApiParam("作业记录编号")
+    public String alId;
+
    /**
     * 触发源:10=扫描枪,
     * 20=提交按钮,30=重置按钮,40=查看明细， 50=明细(删除)