From 91a453198edfc4450ecc91adfcccee6ccf25a3f0 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期四, 10 四月 2025 15:52:08 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject

---
 hangzhoumesParent/common/servicebase/src/main/resources/mapper/UpPattenUsageMapper.xml |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/hangzhoumesParent/common/servicebase/src/main/resources/mapper/UpPattenUsageMapper.xml b/hangzhoumesParent/common/servicebase/src/main/resources/mapper/UpPattenUsageMapper.xml
index e859f86..e19a528 100644
--- a/hangzhoumesParent/common/servicebase/src/main/resources/mapper/UpPattenUsageMapper.xml
+++ b/hangzhoumesParent/common/servicebase/src/main/resources/mapper/UpPattenUsageMapper.xml
@@ -13,11 +13,10 @@
         <result column="state" property="state"/>
         <result column="group_number" property="groupNumber"/>
     </resultMap>
-    <select id="queryRawGlassByEngineeringId" resultType="com.mes.uppattenusage.entity.vo.UpPattenUsageVO">
+    <select id="queryRawGlassByEngineeringId" resultMap="baseMap">
         SET @prev_width := NULL;
         SET @prev_height := NULL;
         SET @counter := 0;
-
         SELECT t.*,
                @counter := IF(@prev_width = width and @prev_height = height, @counter, @counter + 1) AS group_number,
                @prev_width := width,

--
Gitblit v1.8.0