Merge branch 'dev' of i3-IMPP/i3plus-pojo into test

6 years ago · edc281dffe
parent ac5432bebb 51d70654ef
commit edc281dffe
1 changed files with 1 additions and 0 deletions
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java
@ -51,6 +51,7 @@ public class WmsRoutingRule extends BaseBean {

    @Column(name = "RULE_TYPE")
    @ApiParam(value = "规则类型(10 推动规则，20 补货规则)", example ="10")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.ROUTING_RULE_TYPE.class, refForeignKey = "value", value = "description")
    private Integer ruleType;

    @Column(name = "SRC_ZONE_NO")