Merge branch 'dev' into test

6 years ago · 7ce12a9c85
parent cbc5882bd5 522efe67b6
commit 7ce12a9c85
1 changed files with 1 additions and 2 deletions
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java
@ -106,8 +106,7 @@ public class WmsDocMovementSn extends BaseBean {
    @ApiParam("ERP库存地")
    private String erpWhNo;

-    @Column(name="SN_STATUS")
-    @ApiParam(value = "状态", example = "10")
+    @Transient
    @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description")
    public Integer itemStatus;
 }