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/LWhLedgerQry.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/consum-base/src/main/java/com/consum/base/pojo/query/LWhLedgerQry.java b/consum-base/src/main/java/com/consum/base/pojo/query/LWhLedgerQry.java
index 7eaf7df..119d2ca 100644
--- a/consum-base/src/main/java/com/consum/base/pojo/query/LWhLedgerQry.java
+++ b/consum-base/src/main/java/com/consum/base/pojo/query/LWhLedgerQry.java
@@ -19,19 +19,20 @@
     private Long agencyId;
 
     @ApiModelProperty("浠撳簱绫诲瀷")
-    private Long warehouseType;
+    private Short warehouseType;
 
     @ApiModelProperty("浠撳簱id")
     private Long warehouseId;
 
     @ApiModelProperty("鐗╁搧鍚嶇О")
     private String goodsTemplateName;
+    private String goodsTemplateId;
 
     @ApiModelProperty("鍒嗙被")
     private Long categoryId;
 
     @ApiModelProperty("浠峰�肩被鍨�")
-    private Long costType;
+    private Short costType;
 
     @ApiModelProperty("鐘舵�侊紙0=鍦ㄩ�旇皟鎷紱1=鍏ュ簱鏈垎鍙戯紱2=宸蹭笅鍙戯紱3=鎶ュ簾 4 闆舵槦鍑哄簱锛�")
     private Short states;

--
Gitblit v1.9.1