From d3dfc07c93ae97cc6a301d9ccf2f8513a6a8ad85 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期三, 10 五月 2023 21:08:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementdetailSharedServiceImpl.java |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementdetailSharedServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementdetailSharedServiceImpl.java
index a587d85..bbd97a3 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementdetailSharedServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementdetailSharedServiceImpl.java
@@ -124,12 +124,12 @@
         if (StringUtils.isNotBlank(serviceReimbursementdetailShared.getOtherfeedesc())){
             wrappers.eq(ServiceReimbursementdetailShared::getOtherfeedesc ,serviceReimbursementdetailShared.getOtherfeedesc());
         }
-        if (StringUtils.isNotBlank(serviceReimbursementdetailShared.getJine())){
-            wrappers.eq(ServiceReimbursementdetailShared::getJine ,serviceReimbursementdetailShared.getJine());
-        }
-        if (StringUtils.isNotBlank(serviceReimbursementdetailShared.getLiyou())){
-            wrappers.eq(ServiceReimbursementdetailShared::getLiyou ,serviceReimbursementdetailShared.getLiyou());
-        }
+//        if (StringUtils.isNotBlank(serviceReimbursementdetailShared.getJine())){
+//            wrappers.eq(ServiceReimbursementdetailShared::getJine ,serviceReimbursementdetailShared.getJine());
+//        }
+//        if (StringUtils.isNotBlank(serviceReimbursementdetailShared.getLiyou())){
+//            wrappers.eq(ServiceReimbursementdetailShared::getLiyou ,serviceReimbursementdetailShared.getLiyou());
+//        }
         return this.list(wrappers);
     }
 

--
Gitblit v1.9.3