Merge branch 'refs/heads/dev_1.0.0_lsd'

leromro-core/src/main/java/com/leromro/core/service/impl/OrderSettlementApplicationServiceImpl.java

@@ -96,6 +96,7 @@ public class OrderSettlementApplicationServiceImpl extends ServiceImpl<OrderSett
             authOrderSettlementApplicationListDTO.setDeptIds(sysDeptList.stream().map(SysDept::getDeptId).collect(Collectors.toList()));
         }
         PageUtils.startPage();
+        PageUtils.orderBy("a.application_time desc");
         return orderSettlementApplicationMapper.selectOrderSettlementApplicationList(authOrderSettlementApplicationListDTO);
     }
 

leromro-framework/src/main/java/com/leromro/framework/config/ApplicationConfig.java

@@ -48,7 +48,7 @@ public class ApplicationConfig
                 .serializerByType(LocalDate.class, new LocalDateSerializer(DateTimeFormatter.ofPattern("yyyy-MM-dd")))
                 .serializerByType(LocalDateTime.class, new LocalDateTimeSerializer(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")))
                 .serializerByType(LocalTime.class, new LocalTimeSerializer(DateTimeFormatter.ofPattern("HH:mm:ss")))
-                .deserializerByType(LocalDate.class, new LocalDateDeserializer(DateTimeFormatter.ofPattern("yyyy-MM-dd")))
+//                .deserializerByType(LocalDate.class, new LocalDateDeserializer(DateTimeFormatter.ofPattern("yyyy-MM-dd")))
                 .deserializerByType(LocalDateTime.class, new LocalDateTimeDeserializer(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")))
                 .deserializerByType(LocalTime.class, new LocalTimeDeserializer(DateTimeFormatter.ofPattern("HH:mm:ss")))
                 .deserializerByType(Date.class, new DateDeserializers.DateDeserializer(DateDeserializers.DateDeserializer.instance, new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"),"yyyy-MM-dd HH:mm:ss"));