From 16d248d779325da73bf1c1ebdd296125f6709383 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 12 Jun 2023 15:52:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/materials/mapper/MaterialsManageMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/materials/mapper/MaterialsManageMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/materials/mapper/MaterialsManageMapper.xml
index 01fbc8a..b6f374d 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/materials/mapper/MaterialsManageMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/materials/mapper/MaterialsManageMapper.xml
@@ -58,7 +58,7 @@
<if test="vo.town !=null and vo.town !=''">
AND MM.town = #{vo.town}
</if>
- <if test="vo.resGuid !=null and resGuid !=''">
+ <if test="vo.resGuid !=null and vo.resGuid !=''">
AND MM.res_guid = #{vo.resGuid}
</if>
<if test="vo.year!=null and vo.year!=''">
--
Gitblit v1.9.3