Merge branch 'dev' of xiongzhu/zhumj into master

src/main/java/com/izouma/zhumj/dto/report/CheckinInfoReportDTO.java

@@ -9,6 +9,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 @Data
@@ -51,7 +52,7 @@ public class CheckinInfoReportDTO {
 
     @ApiModelProperty(value = "入住时间", name = "checkinTime")
     @ExcelProperty(value = "入住时间")
-    private LocalDateTime checkinTime;
+    private LocalDate checkinTime;
 
     @ApiModelProperty(value = "退宿时间", name = "checkoutTime")
     @ExcelProperty(value = "退宿时间")

src/main/java/com/izouma/zhumj/service/CheckinInfoService.java

@@ -604,7 +604,7 @@ public class CheckinInfoService {
                     .monthRate(checkinInfo.getMonthRate())
                     .dayRate(checkinInfo.getDayRate())
                     .depositAmount(checkinInfo.getDepositAmount())
-                    .checkinTime(checkinInfo.getCheckinTime())
+                    .checkinTime(checkinInfo.getCheckinTime().toLocalDate())
                     .checkoutTime(checkinInfo.getCheckoutTime())
                     .planOutTime(checkinInfo.getPlanOutTime())
                     .remark(checkinInfo.getRemark())

src/main/java/com/izouma/zhumj/web/CheckinInfoController.java

@@ -157,7 +157,7 @@ public class CheckinInfoController extends BaseController {
                     .monthRate(checkinInfo.getMonthRate())
                     .dayRate(checkinInfo.getDayRate())
                     .depositAmount(checkinInfo.getDepositAmount())
-                    .checkinTime(checkinInfo.getCheckinTime())
+                    .checkinTime(checkinInfo.getCheckinTime().toLocalDate())
                     .checkoutTime(checkinInfo.getCheckoutTime())
                     .planOutTime(checkinInfo.getPlanOutTime())
                     .remark(checkinInfo.getRemark())