Merge remote-tracking branch 'remotes/origin/dev' into test

6 years ago · c99d7aec25
parent 12e2f1d1b8 da5c5e55b8
commit c99d7aec25
1 changed files with 2 additions and 2 deletions
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java
@ -45,8 +45,8 @@ public class WmsActionModule extends BaseBean {
    public Integer amType;

    @Column(name = "OP_TYPE_CODE")
-    @ApiParam(value = "作业类型", example = "0")
-    public Integer opTypeCode;
+    @ApiParam(value = "作业类型")
+    public String opTypeCode;

    @Column(name = "IS_SHOW_INFO")
    @ApiParam(value = "是否实现回显", example = "0")