From 2d03ec79e1892248b520cf097e8a58dd82a4892f Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 22 五月 2026 15:19:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印

---
 src/main/resources/mapper/production/ProcessRouteItemMapper.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/production/ProcessRouteItemMapper.xml b/src/main/resources/mapper/production/ProcessRouteItemMapper.xml
index 3814aeb..8917231 100644
--- a/src/main/resources/mapper/production/ProcessRouteItemMapper.xml
+++ b/src/main/resources/mapper/production/ProcessRouteItemMapper.xml
@@ -10,13 +10,13 @@
         <result property="tenantId" column="tenant_id"/>
         <result property="createTime" column="create_time"/>
         <result property="updateTime" column="update_time"/>
+        <result property="dragSort" column="drag_sort"/>
     </resultMap>
 
     <select id="listProcessRouteItemDto" resultType="com.ruoyi.production.dto.ProcessRouteItemDto">
         select pri.*,
                pr.description ,
                pp.name as process_name,
-               pm.speculative_trading_name,
                pm.product_id,
                pm.model,
                p.product_name,
@@ -29,6 +29,6 @@
                 left join process_route pr on pr.id = pri.route_id
         where
             pri.route_id = #{c.routeId}
-        order by pri.id
+        order by pri.drag_sort
     </select>
 </mapper>

--
Gitblit v1.9.3