Merge remote-tracking branch 'origin/master'

liusheng

2026-03-27 c309ec6868bf937529e8e3ff948dbdedd66e5631

 smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskDetailServiceImpl.java

@@ -109,7 +109,8 @@
                }
            }
        }
        Collections.sort(serviceSubtaskDetailSET, Comparator.comparingLong(ServiceSubtaskDetail::getTemplatequestionnum));
        Collections.sort(serviceSubtaskDetailSET,
                Comparator.comparing(ServiceSubtaskDetail::getTemplatequestionnum, Comparator.nullsLast(Long::compareTo)));
        map1.put("filteredDetails", serviceSubtaskDetailSET);

        map1.put("voice", "");