From e9947bdc69e4719a401427cbac743b9cbeb52953 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Mon, 10 Mar 2025 14:36:42 +0800
Subject: [PATCH] =?UTF-8?q?pom=E4=BE=9D=E8=B5=96=E6=8E=92=E9=99=A4?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=20=E5=8F=B0=E6=A1=8C=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=9C=89=E8=AF=AF=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cash-dependencies/pom.xml                                   | 6 ++++++
 cash-service/account-service/pom.xml                        | 6 ++++++
 .../src/main/resources/mapper/ShopTableMapper.xml           | 1 +
 3 files changed, 13 insertions(+)

diff --git a/cash-dependencies/pom.xml b/cash-dependencies/pom.xml
index 4e5e936a..1dbbd547 100644
--- a/cash-dependencies/pom.xml
+++ b/cash-dependencies/pom.xml
@@ -47,6 +47,12 @@
                 <groupId>com.czg</groupId>
                 <artifactId>cash-common-tools</artifactId>
                 <version>${project.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.projectlombok</groupId>
+                        <artifactId>lombok</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>com.github.binarywang</groupId>
diff --git a/cash-service/account-service/pom.xml b/cash-service/account-service/pom.xml
index 9badb240..2c77e981 100644
--- a/cash-service/account-service/pom.xml
+++ b/cash-service/account-service/pom.xml
@@ -21,6 +21,12 @@
         <dependency>
             <groupId>com.github.binarywang</groupId>
             <artifactId>weixin-java-miniapp</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.projectlombok</groupId>
+                    <artifactId>lombok</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.github.whvcse</groupId>
diff --git a/cash-service/account-service/src/main/resources/mapper/ShopTableMapper.xml b/cash-service/account-service/src/main/resources/mapper/ShopTableMapper.xml
index 573a7154..46d2fb2d 100644
--- a/cash-service/account-service/src/main/resources/mapper/ShopTableMapper.xml
+++ b/cash-service/account-service/src/main/resources/mapper/ShopTableMapper.xml
@@ -23,6 +23,7 @@
         <if test="name != null and name != ''">
             and a.name like concat('%', #{name}, '%')
         </if>
+        group by a.id
         ORDER BY a.create_time
 
     </select>