Merge remote-tracking branch 'origin/master'

jiaosong

2023-08-24 fe0ef3441cd689e3679696d990b0ca1b5d7193ac

 server/src/main/java/doumeemes/service/ext/impl/ProceduresExtServiceImpl.java

@@ -230,7 +230,7 @@
            return new ArrayList<>();
        }
        Bom bom = bomList.get(Constants.ZERO);
       List<Procedures> proceduresList = proceduresMapper.selectList(
        List<Procedures> proceduresList = proceduresMapper.selectList(
                new QueryWrapper<Procedures>().apply(" id in ( select r.PROCEDURE_ID  from route_procedure r where r.ROUTE_ID = '"+bom.getRouteId()+"' )  ")
                        .orderByAsc( " SORTNUM  ")
        );