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

src/main/java/com/xjrsoft/module/oa/dto/TodayMeetingMobilePageDto.java

@@ -24,6 +24,6 @@ public class TodayMeetingMobilePageDto extends PageInput {
      * 会议日期
      */
     @ApiModelProperty("会议日期")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private LocalDate meetingApplyDate;
 }