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

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcMoveInAddEditFormDTO.java

@@ -86,7 +86,7 @@ public class IcMoveInAddEditFormDTO implements Serializable {
      * 迁入时间
      */
     @NotNull(message = "迁入时间不能为空", groups = {AddGroup.class})
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date inTime;
     /**
      * 迁入原因

epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcMoveInRecordExcel.java

@@ -51,7 +51,7 @@ public class IcMoveInRecordExcel {
     @ExcelProperty(value = "迁入时间")
     @ColumnWidth(20)
     @Excel(name = "迁入时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date inTime;
 
     @ExcelProperty(value = "迁入原因")

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcBirthRecordServiceImpl.java

@@ -337,6 +337,7 @@ public class IcBirthRecordServiceImpl extends BaseServiceImpl<IcBirthRecordDao,
         wrapper.like(StringUtils.isNotBlank(formDTO.getIdCard()), IcBirthRecordEntity::getIdCard, formDTO.getIdCard());
         wrapper.ge(StringUtils.isNotBlank(formDTO.getStartTime()), IcBirthRecordEntity::getBirthday, formDTO.getStartTime());
         wrapper.le(StringUtils.isNotBlank(formDTO.getEndTime()), IcBirthRecordEntity::getBirthday, formDTO.getEndTime());
+        wrapper.orderByDesc(IcBirthRecordEntity::getCreatedTime);
         return wrapper;
     }