From f86aff26147df8756d3246a7d5345232b991e4c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Fri, 11 Jul 2025 17:12:54 +0800
Subject: [PATCH] 1

---
 business/model/dao/lakala.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/business/model/dao/lakala.go b/business/model/dao/lakala.go
index e5ec566e0..d6caa1d5c 100644
--- a/business/model/dao/lakala.go
+++ b/business/model/dao/lakala.go
@@ -112,11 +112,11 @@ func GetIncoming(storeID int, merchantNo string, offset, pageSize int) (pagedInf
 				 JOIN store s ON l.store_id = s.id 
              WHERE 1=1 `
 	if storeID != 0 {
-		sql += ` AND s.store_id = ? `
+		sql += ` AND s.id = ? `
 		param = append(param, storeID)
 	}
 	if merchantNo != "" {
-		sql += ` AND s.merchant_no = ?`
+		sql += ` AND l.merchant_no = ?`
 		param = append(param, merchantNo)
 	}
 	sql += `