Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into lingshan_master

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/LingshanOfficeHallServiceRecordDTO.java

@@ -8,7 +8,6 @@ import org.hibernate.validator.constraints.Length;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -119,7 +118,7 @@ public class LingshanOfficeHallServiceRecordDTO implements Serializable {
      */
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @NotNull(message = "申请日期不能为空",groups = {AddShowGroup.class,UpdateShowGroup.class})
+    // @NotNull(message = "申请日期不能为空",groups = {AddShowGroup.class,UpdateShowGroup.class})
     private Date applicantTime;
 
     /**

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LingshanOfficeHallServiceRecordServiceImpl.java

@@ -74,7 +74,7 @@ public class LingshanOfficeHallServiceRecordServiceImpl extends BaseServiceImpl<
             });
         }
         PageInfo pageInfo = new PageInfo<>(resultList);
-        return new PageData<>(resultList, pageInfo.getTotal());
+        return new PageData<>(resultList, pageInfo.getTotal(),formDTO.getPageSize());
     }
 
     /**