From b919b454bccc18d67b7109a09357499d09211eac Mon Sep 17 00:00:00 2001
From: 彭雪彬 <1724387007@qq.com>
Date: Thu, 17 Jul 2025 18:07:08 +0800
Subject: [PATCH] Merge branch 'xin' into pxb
---
oying-system/src/main/java/com/oying/modules/sh/mapper/OrderReturnMapper.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/sh/mapper/OrderReturnMapper.java b/oying-system/src/main/java/com/oying/modules/sh/mapper/OrderReturnMapper.java
index cc2598b..58667c5 100644
--- a/oying-system/src/main/java/com/oying/modules/sh/mapper/OrderReturnMapper.java
+++ b/oying-system/src/main/java/com/oying/modules/sh/mapper/OrderReturnMapper.java
@@ -20,11 +20,11 @@
IPage<OrderReturn> findAll(@Param("criteria") OrderReturnQueryCriteria criteria, @Param("blurry") String blurry, Page<Object> page);
- List<OrderReturn> findAll(@Param("criteria") OrderReturnQueryCriteria criteria, @Param("criteria") String blurry);
+ List<OrderReturn> findAll(@Param("criteria") OrderReturnQueryCriteria criteria, @Param("blurry") String blurry);
OrderReturn getByReturnNum(String returnNum);
void updatePayStatus(String returnNum, String status, String time);
- Long countAll(@Param("criteria") OrderReturnQueryCriteria criteria, @Param("criteria") String blurry);
+ Long countAll(@Param("criteria") OrderReturnQueryCriteria criteria, @Param("blurry") String blurry);
}
--
Gitblit v1.9.3