From 3f69b4dfc585c4dfbc3c07a6acf5cdd838033636 Mon Sep 17 00:00:00 2001
From: liuguocan <527956374@qq.com>
Date: 星期二, 28 十一月 2023 14:45:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
consum-base/src/main/java/com/consum/base/pojo/query/WhWarningQry.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/pojo/query/WhWarningQry.java b/consum-base/src/main/java/com/consum/base/pojo/query/WhWarningQry.java
index 3c608a6..4495408 100644
--- a/consum-base/src/main/java/com/consum/base/pojo/query/WhWarningQry.java
+++ b/consum-base/src/main/java/com/consum/base/pojo/query/WhWarningQry.java
@@ -17,6 +17,7 @@
public class WhWarningQry extends ParamRequest {
@ApiModelProperty("鐗╁搧鍚嶇О")
private String goodsTemplateName;
+ private String goodsTemplateId;
@ApiModelProperty("瑙勬牸鍨嬪彿")
private Long baseGoodsModelsId;
@@ -31,7 +32,7 @@
private Long agencyId;
@ApiModelProperty("浠撳簱绫诲瀷")
- private Long warehouseType;
+ private Short warehouseType;
@ApiModelProperty("浠撳簱id")
private Long baseWarehouseId;
@@ -39,6 +40,9 @@
@ApiModelProperty("鐘舵�侊紙1=鏈煡鐪嬶紱2=宸叉煡鐪嬶級")
private Integer states;
+ @ApiModelProperty("棰勮绫诲瀷锛�1=瓒呬笂闄愶紱2=瓒呬笅闄愶級")
+ private Short warningType;
+
@ApiModelProperty(value = "姣忛〉鏄剧ず鏉℃暟")
private Integer pageSize = 10;
--
Gitblit v1.9.1