From 62084735c1f5d6b6d4771aadf4d9241479a4d4ee Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 24 Oct 2022 15:06:16 +0800
Subject: [PATCH] 用户查询增加模糊查询；修复当编辑用户时账号解封的问题；全景管理查询未删除的数据；当性别，生日未填时数据库同时也录入数据

---
 src/main/java/org/springblade/modules/stock/vo/StocksVO.java |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/stock/vo/StocksVO.java b/src/main/java/org/springblade/modules/stock/vo/StocksVO.java
index ab64118..10bc130 100644
--- a/src/main/java/org/springblade/modules/stock/vo/StocksVO.java
+++ b/src/main/java/org/springblade/modules/stock/vo/StocksVO.java
@@ -48,5 +48,16 @@
 	 * 结束时间
 	 */
 	private String endTime;
-
+	/**
+	 * 总的入库数量
+	 */
+	Double zrknum;
+	/**
+	 * 总的出库数量
+	 */
+	Double zcknum;
+	/**
+	 * 农资类型分类（0：化肥 1：有机肥 2：杀虫剂 等）
+	 */
+	String stockType;
 }

--
Gitblit v1.9.3