From 035102c0edd71b7cb6af7d42de84a8a251c5915f Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Mon, 8 Aug 2022 16:56:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=92=E5=BA=8F=E8=A7=84?=
 =?UTF-8?q?=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/CustomerGridDao.xml               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
index 2db2797dac..95a9b36765 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
@@ -481,8 +481,8 @@
             </if>
             AND grid.customer_id = #{customerId}
        ORDER BY
-           CONVERT ( gridName USING gbk ) ASC,
            grid.sort,
+           CONVERT ( gridName USING gbk ) ASC,
            grid.customer_id