Merge remote-tracking branch 'origin/ext-dev' into ext-dev

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;

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 = "可用数量")