From 4f74fdaa3d474536f9c15beec5e42a0565213092 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Mon, 31 May 2021 16:49:57 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=AF=86=E7=A0=81=E8=BF=87=E6=9C=9F?= =?UTF-8?q?=E7=AD=96=E7=95=A5=E5=8A=A0=E5=85=A5=E5=AE=89=E5=85=A8=E7=AD=96?= =?UTF-8?q?=E7=95=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java index adc5425..c5f6fd4 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java @@ -1085,7 +1085,6 @@ public class ImppEnumUtil { WORK_WECHAT(8, "企业微信配置"), SMS(9, "短信配置"), SSO(10, "单点登录配置"), - PASSWORD_EXPIRE(11, "密码过期策略"), DINGTALK_REDIRECT(12, "钉钉授权跳转"); private final int value; From d71434851c73608f7df3daf50b42823e765d9aa2 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Tue, 1 Jun 2021 10:33:08 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BA=93=E4=BD=8D?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java index fed5744..599f637 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java @@ -4,10 +4,6 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; - -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; - import lombok.EqualsAndHashCode; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -16,6 +12,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Index; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; import javax.persistence.Table; import javax.persistence.Transient; import javax.persistence.Version; @@ -93,6 +91,11 @@ public class WmsStockQuan extends BaseBean { @ApiParam(value = "库位信息") private WmsLocate wmsLocate; + @Transient + @ApiParam(value = "库位名称") + private String locateName; + + @Column(name = "QTY", columnDefinition = "decimal(18,8) default 0", nullable = false) @ApiParam(value = "可用数量")