Merge remote-tracking branch 'origin/dev' into dev

liuleilei

2023-09-11 faf1d3cc35a3a5f83558946c8056537a4d77fa1f

 server/src/main/resources/mappers/ProceduresExtMapper.xml

@@ -562,7 +562,7 @@
               dmodel.id as dmodelRouteProductId
        FROM `procedures` `a`
        LEFT JOIN route_procedure `dmodel`  on dmodel.PROCEDURE_ID=a.id
        where dmodel.ROUTE_ID=#{routeId} and dmodel.DELETED=0 and `a`.`DELETED`=0
        where dmodel.ROUTE_ID=#{routeId} and dmodel.DELETED=0 and `a`.`DELETED`=0 order by dmodel.SORTNUM asc
    </select>