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

adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java

@@ -67,7 +67,7 @@ public class WorkFlowController {
             exportExcelEO.setFileName(UUID.fastUUID().toString(true));
         }
         List<Map<String, Object>> dataList = exportExcelEO.getDataList().stream()
-                .sorted(Comparator.comparing(a -> Double.valueOf(a.get("chapterNumber").toString())))
+                .sorted(Comparator.comparing(a -> String.valueOf(a.get("chapterNumber").toString())))
                 .collect(Collectors.toList());
 
         Workbook excel = TableToExcel.createExcel(exportExcelEO.getColumnName(), dataList, null, exportExcelEO.getFileName());