Browse Source

fix(date): 调整时区为GMT+8- 将所有日期时间格式的时区从GMT调整为GMT+8
- 修复日期显示与本地时间不一致的问题
- 统一代码模板中的时区设置- 确保数据导出和显示的时间准确性

SheepHy 3 weeks ago
parent
commit
976f409a96
100 changed files with 235 additions and 235 deletions
  1. 2 2
      national-motion-base-core/src/main/java/org/jeecg/common/system/base/entity/JeecgEntity.java
  2. 1 1
      national-motion-base-core/src/main/java/org/jeecg/common/system/vo/LoginUser.java
  3. 1 1
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/controller/OrderController.java
  4. 6 6
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/dto/AppOrderInfoDTO.java
  5. 1 1
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/dto/AppSubmitFeedbackRequestDTO.java
  6. 1 1
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/dto/evaluate/AddEvaluateDTO.java
  7. 2 2
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/form/InsureOrderInfoForm.java
  8. 2 2
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/vo/AppCoursesPageVO.java
  9. 2 2
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/vo/AppGameScheduleVO.java
  10. 2 2
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/vo/CoursesPriceRulesVO.java
  11. 7 7
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/vo/OrderVO.java
  12. 2 2
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/vo/PageOrdersVO.java
  13. 4 4
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/vo/PlaceInfoVO.java
  14. 2 2
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/vo/course/CourseResponseVo.java
  15. 3 3
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/vo/game/FindByIdResponse.java
  16. 2 2
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/vo/game/FindPagResponse.java
  17. 2 2
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/vo/game/GameScheduleVO.java
  18. 2 2
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/vo/stadium/ConcertsDetailsVO.java
  19. 2 2
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/hikiot/dto/AddUserRequestDTO.java
  20. 1 1
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/message/entity/SysMessage.java
  21. 2 2
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/quartz/entity/QuartzJob.java
  22. 1 1
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/quartz/vo/JobClassNoticeVo.java
  23. 1 1
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/quartz/vo/JobReservationSiteVo.java
  24. 2 2
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/dto/AppCoursesCuDTO.java
  25. 2 2
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/dto/AppCoursesInfoPageDTO.java
  26. 2 2
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/dto/AppCoursesRuleDTO.java
  27. 3 3
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/dto/AppGameCuDTO.java
  28. 2 2
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/dto/AppGameScheduleDTO.java
  29. 2 2
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/dto/AppSiteDTO.java
  30. 2 2
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/dto/AppSiteRuleDTO.java
  31. 2 2
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/dto/AppSiteRuleTimeDTO.java
  32. 2 2
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/dto/AppSiteRuleTimeFormDTO.java
  33. 1 1
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/dto/AppTeachingTimeDTO.java
  34. 4 4
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/dto/ContractSignDTO.java
  35. 2 2
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/dto/ExportConditionDTO.java
  36. 1 1
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/dto/FindPageCUserInfoResponseDTO.java
  37. 1 1
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/dto/FindResponseDTO.java
  38. 3 3
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/dto/evaluate/FindEvaluateResponseDTO.java
  39. 3 3
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/dto/insureOrder/FindInsureOrderPageResponseDTO.java
  40. 1 1
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/dto/merchant/FindMerchantResponseDTO.java
  41. 2 2
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/dto/receiptPaymentDetails/ReceiptPaymentDetailsInfoVo.java
  42. 1 1
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/dto/separateAccounts/FindAccountResponseDTO.java
  43. 2 2
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/AppBanner.java
  44. 2 2
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/AppCategory.java
  45. 2 2
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/AppContractInfo.java
  46. 3 3
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/AppContractSign.java
  47. 4 4
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/AppCourses.java
  48. 4 4
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/AppCoursesPriceRules.java
  49. 5 5
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/AppCoursesVerificationRecord.java
  50. 2 2
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/AppDevice.java
  51. 3 3
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/AppEvaluate.java
  52. 2 2
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/AppFeedback.java
  53. 5 5
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/AppGame.java
  54. 2 2
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/AppGamePriceRules.java
  55. 4 4
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/AppGameSchedule.java
  56. 3 3
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/AppGmtInfo.java
  57. 2 2
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/AppHikiotDevice.java
  58. 2 2
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/AppInstructor.java
  59. 2 2
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/AppInsure.java
  60. 2 2
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/AppInsureNumber.java
  61. 4 4
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/AppIsin.java
  62. 2 2
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/AppKongfuZone.java
  63. 3 3
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/AppOrder.java
  64. 2 2
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/AppOrderProInfo.java
  65. 2 2
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/AppSearchHot.java
  66. 4 4
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/AppSite.java
  67. 2 2
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/AppSitePlace.java
  68. 5 5
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/AppSitePriceRules.java
  69. 4 4
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/AppSiteRuleTime.java
  70. 3 3
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/AppTeachingTime.java
  71. 3 3
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/Evaluate.java
  72. 2 2
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/FamilyMembers.java
  73. 5 5
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/InsureOrderInfo.java
  74. 2 2
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/InsurePrice.java
  75. 2 2
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/Protocol.java
  76. 2 2
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/ReceiptPaymentDetailsInfo.java
  77. 2 2
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/SeparateAccounts.java
  78. 2 2
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/ShopMoney.java
  79. 2 2
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/ShopMoneyHis.java
  80. 2 2
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/StatisticsInfo.java
  81. 2 2
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/StatisticsInfoHis.java
  82. 2 2
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/form/AppOrderPageForm.java
  83. 2 2
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/mapper/xml/AppSitePlaceMapper.xml
  84. 2 2
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/vo/AppOrderInfoVO.java
  85. 2 2
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/vo/ContractSignVO.java
  86. 1 1
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/vo/OrderPageVO.java
  87. 1 1
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/vo/staff/StaffResponseVO.java
  88. 1 1
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/vo/statistics/FindByStatisticsChartVO.java
  89. 6 6
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/entity/SysAnnouncement.java
  90. 3 3
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/entity/SysAnnouncementSend.java
  91. 2 2
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/entity/SysCategory.java
  92. 2 2
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/entity/SysCheckRule.java
  93. 2 2
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/entity/SysComment.java
  94. 2 2
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDataLog.java
  95. 2 2
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDataSource.java
  96. 2 2
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepart.java
  97. 2 2
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepartRole.java
  98. 1 1
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepartRolePermission.java
  99. 2 2
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/entity/SysFillRule.java
  100. 1 1
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/entity/SysFormFile.java

+ 2 - 2
national-motion-base-core/src/main/java/org/jeecg/common/system/base/entity/JeecgEntity.java

@@ -45,7 +45,7 @@ public class JeecgEntity implements Serializable {
      */
     @Schema(description = "创建时间")
     @Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private java.util.Date createTime;
 
@@ -61,7 +61,7 @@ public class JeecgEntity implements Serializable {
      */
     @Schema(description = "更新时间")
     @Excel(name = "更新时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private java.util.Date updateTime;
 

+ 1 - 1
national-motion-base-core/src/main/java/org/jeecg/common/system/vo/LoginUser.java

@@ -71,7 +71,7 @@ public class LoginUser {
 	/**
 	 * 生日
 	 */
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
 	@DateTimeFormat(pattern = "yyyy-MM-dd")
 	private Date birthday;
 

+ 1 - 1
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/controller/OrderController.java

@@ -56,7 +56,7 @@ public class OrderController {
     @Operation(summary = "学校场地预约-预览页")
     @GetMapping("/previewOrderPlaceSchool")
     public Result<OrderVO.PreviewOrderPlaceSchool> previewOrderPlaceSchool(@RequestParam("placeId") @Schema(description = "场地ID") String placeId,
-                                                                           @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd")
+                                                                           @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
                                                                            @DateTimeFormat(pattern = "yyyy-MM-dd")
                                                                            @RequestParam("startTime") @Schema(description = "当前选择日期(年月日)") Date startTime) {
         return Result.ok(appOrderService.previewOrderPlaceSchool(placeId, startTime));

+ 6 - 6
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/dto/AppOrderInfoDTO.java

@@ -43,12 +43,12 @@ public class AppOrderInfoDTO implements Serializable {
     @Schema(description = "订单类型")
     private Integer orderType;
 
-    @JsonFormat(timezone = "GMT",shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Schema(description = "下单时间")
     private Date createTime;
 
-    @JsonFormat(timezone = "GMT",shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Schema(description = "付款时间")
     private Date payTime;
@@ -80,25 +80,25 @@ public class AppOrderInfoDTO implements Serializable {
     private Date dateOfSale;
 
     @Excel(name = "开始时间", width = 20, format = "HH:mm")
-    @JsonFormat(timezone = "GMT",pattern = "HH:mm")
+    @JsonFormat(timezone = "GMT+8",pattern = "HH:mm")
     @DateTimeFormat(pattern="HH:mm")
     @Schema(description = "开始时间")
     private Date startTime;
 
     @Excel(name = "结束时间", width = 20, format = "HH:mm")
-    @JsonFormat(timezone = "GMT",pattern = "HH:mm")
+    @JsonFormat(timezone = "GMT+8",pattern = "HH:mm")
     @DateTimeFormat(pattern="HH:mm")
     @Schema(description = "结束时间")
     private Date endTime;
 
     @Excel(name = "开始时间", width = 20, format = "yyyy-MM-dd")
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @Schema(description = "开始时间")
     private Date gameStartTime;
 
     @Excel(name = "结束时间", width = 20, format = "yyyy-MM-dd")
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @Schema(description = "结束时间")
     private Date gameEndTime;

+ 1 - 1
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/dto/AppSubmitFeedbackRequestDTO.java

@@ -35,7 +35,7 @@ public class AppSubmitFeedbackRequestDTO {
     @Schema(description = "反馈图片地址,使用;进行隔开")
     private String feedbackImg;
     /**创建时间*/
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建时间")
     private Date createTime=new Date();

+ 1 - 1
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/dto/evaluate/AddEvaluateDTO.java

@@ -46,7 +46,7 @@ public class AddEvaluateDTO {
     @Schema(description = "业务类型;0场地 1课程")
     private Integer type;
     /**创建时间;创建时间*/
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建时间;创建时间")
     private Date createTime;

+ 2 - 2
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/form/InsureOrderInfoForm.java

@@ -25,12 +25,12 @@ public class InsureOrderInfoForm implements Serializable {
     //生效时间
     @Schema(description = "生效时间-起")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     private Date assertStartTime;
 
     @Schema(description = "生效时间-止")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     private Date assertEndTime;
 
     //保单费用(单价)

+ 2 - 2
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/vo/AppCoursesPageVO.java

@@ -35,12 +35,12 @@ public class AppCoursesPageVO implements Serializable {
     @Schema(description = "课时数")
     private Integer classNum;
 
-    @JsonFormat(timezone = "GMT",pattern = "MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "MM-dd")
     @DateTimeFormat(pattern="MM-dd")
     @Schema(description = "开始时间")
     private Date startTime;
 
-    @JsonFormat(timezone = "GMT",pattern = "MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "MM-dd")
     @DateTimeFormat(pattern="MM-dd")
     @Schema(description = "结束时间")
     private java.util.Date endTime;

+ 2 - 2
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/vo/AppGameScheduleVO.java

@@ -26,12 +26,12 @@ public class AppGameScheduleVO implements Serializable {
     @Schema(description = "比赛名称")
     private String name;
 
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "开始时间")
     private Date startTime;
 
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "结束时间")
     private Date endTime;

+ 2 - 2
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/vo/CoursesPriceRulesVO.java

@@ -35,12 +35,12 @@ public class CoursesPriceRulesVO implements Serializable {
     @Schema(description = "课程类型")
     private Integer courseType;
 
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Schema(description = "开始时间")
     private Date startTime;
 
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Schema(description = "结束时间")
     private Date endTime;

+ 7 - 7
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/vo/OrderVO.java

@@ -48,13 +48,13 @@ public class OrderVO {
         private String name;
         /**开始时间*/
         @Excel(name = "开始时间", width = 20, format = "HH:mm:ss")
-        @JsonFormat(timezone = "GMT",pattern = "HH:mm:ss")
+        @JsonFormat(timezone = "GMT+8",pattern = "HH:mm:ss")
         @DateTimeFormat(pattern="HH:mm:ss")
         @Schema(description = "开始时间")
         private Date startTime;
         /**结束时间*/
         @Excel(name = "结束时间", width = 20, format = "HH:mm:ss")
-        @JsonFormat(timezone = "GMT",pattern = "HH:mm:ss")
+        @JsonFormat(timezone = "GMT+8",pattern = "HH:mm:ss")
         @DateTimeFormat(pattern="HH:mm:ss")
         @Schema(description = "结束时间")
         private Date endTime;
@@ -154,11 +154,11 @@ public class OrderVO {
         @Schema(description = "有效期")
         private int indate;
         @Schema(description = "营业时间开始")
-        @JsonFormat(timezone = "GMT",pattern = "HH:mm:ss")
+        @JsonFormat(timezone = "GMT+8",pattern = "HH:mm:ss")
         @DateTimeFormat(pattern="HH:mm:ss")
         private Date startTime;
         @Schema(description = "营业时间结束")
-        @JsonFormat(timezone = "GMT",pattern = "HH:mm:ss")
+        @JsonFormat(timezone = "GMT+8",pattern = "HH:mm:ss")
         @DateTimeFormat(pattern="HH:mm:ss")
         private Date endTime;
         @Schema(description = "提前预约时间")
@@ -182,11 +182,11 @@ public class OrderVO {
         private String id;
         @Schema(description = "时间段名称")
         private String name;
-        @JsonFormat(timezone = "GMT",pattern = "HH:mm:ss")
+        @JsonFormat(timezone = "GMT+8",pattern = "HH:mm:ss")
         @DateTimeFormat(pattern="HH:mm:ss")
         @Schema(description = "开始时间")
         private Date startTime;
-        @JsonFormat(timezone = "GMT",pattern = "HH:mm:ss")
+        @JsonFormat(timezone = "GMT+8",pattern = "HH:mm:ss")
         @DateTimeFormat(pattern="HH:mm:ss")
         @Schema(description = "结束时间")
         private Date endTime;
@@ -253,7 +253,7 @@ public class OrderVO {
     @EqualsAndHashCode(callSuper = false)
     @Schema(description="学校包场-预览时间选择")
     public static class PreviewOrderPlaceSchoolTime{
-        @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd")
+        @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
         @DateTimeFormat(pattern = "yyyy-MM-dd")
         @Schema(description = "日期")
         private Date day;

+ 2 - 2
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/vo/PageOrdersVO.java

@@ -55,12 +55,12 @@ public class PageOrdersVO implements Serializable {
 
     @Schema(description = "创建时间")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
     @Schema(description = "过期时间")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     private Date epxTime;
 
     @Schema(description = "子订单")

+ 4 - 4
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/vo/PlaceInfoVO.java

@@ -20,12 +20,12 @@ public class PlaceInfoVO {
     private String id;
     @Schema(description = "单位名称(部门名称)")
     private String name;
-    @JsonFormat(timezone = "GMT",pattern = "HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "HH:mm:ss")
     @DateTimeFormat(pattern="HH:mm:ss")
     @Schema(description = "开始营业时间")
     private Date startTime;
     /**结束营业时间*/
-    @JsonFormat(timezone = "GMT",pattern = "HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "HH:mm:ss")
     @DateTimeFormat(pattern="HH:mm:ss")
     @Schema(description = "结束营业时间")
     private Date endTime;
@@ -139,11 +139,11 @@ public class PlaceInfoVO {
         private int period;
         @Schema(description = "距离")
         private BigDecimal km;
-        @JsonFormat(timezone = "GMT",pattern = "MM-dd")
+        @JsonFormat(timezone = "GMT+8",pattern = "MM-dd")
         @Schema(description = "开始时间")
         private Date startTime;
 
-        @JsonFormat(timezone = "GMT",pattern = "MM-dd")
+        @JsonFormat(timezone = "GMT+8",pattern = "MM-dd")
         @Schema(description = "开始时间")
         private Date endTime;
     }

+ 2 - 2
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/vo/course/CourseResponseVo.java

@@ -41,11 +41,11 @@ public class CourseResponseVo extends PageDTO {
     @Schema(description = "课时数")
     private Integer coursesNum;
     @Schema(description = "开始时间")
-    @JsonFormat(timezone = "GMT",pattern = "MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "MM-dd")
     @DateTimeFormat(pattern="MM-dd")
     private Date startTime;
     @Schema(description = "结束时间")
-    @JsonFormat(timezone = "GMT",pattern = "MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "MM-dd")
     @DateTimeFormat(pattern="MM-d")
     private Date endTime;
     @Schema(description = "年销售数")

+ 3 - 3
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/vo/game/FindByIdResponse.java

@@ -22,11 +22,11 @@ public class FindByIdResponse {
     private String cover;
     @Schema(description = "赛事名称")
     private String name;
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @Schema(description = "开始时间")
     private Date startTime;
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @Schema(description = "结束时间")
     private Date endTime;
@@ -38,7 +38,7 @@ public class FindByIdResponse {
     private String backgroundImage;
     @Schema(description = "背景图集合")
     private List<String> backgroundImageList;
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "报名结束时间")
     private Date applicationEndTime;

+ 2 - 2
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/vo/game/FindPagResponse.java

@@ -24,11 +24,11 @@ public class FindPagResponse {
     private String name;
     @Schema(description = "最低价格")
     private BigDecimal minPrice;
-    @JsonFormat(timezone = "GMT",pattern = "MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "MM-dd")
     @DateTimeFormat(pattern="MM-dd")
     @Schema(description = "开始时间")
     private Date startTime;
-    @JsonFormat(timezone = "GMT",pattern = "MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "MM-dd")
     @DateTimeFormat(pattern="MM-dd")
     @Schema(description = "结束时间")
     private Date endTime;

+ 2 - 2
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/vo/game/GameScheduleVO.java

@@ -19,11 +19,11 @@ public class GameScheduleVO {
     private String id;
     @Schema(description = "赛事名称")
     private String name;
-    @JsonFormat(timezone = "GMT",pattern = "MM-dd HH:mm")
+    @JsonFormat(timezone = "GMT+8",pattern = "MM-dd HH:mm")
     @DateTimeFormat(pattern="MM-dd HH:mm")
     @Schema(description = "开始时间")
     private Date startTime;
-    @JsonFormat(timezone = "GMT",pattern = "MM-dd HH:mm")
+    @JsonFormat(timezone = "GMT+8",pattern = "MM-dd HH:mm")
     @DateTimeFormat(pattern="MM-dd HH:mm")
     @Schema(description = "结束时间")
     private Date endTime;

+ 2 - 2
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/vo/stadium/ConcertsDetailsVO.java

@@ -19,12 +19,12 @@ public class ConcertsDetailsVO {
     private String id;
     /**场所名称*/
     @Schema(description = "场所开始时间")
-    @JsonFormat(timezone = "GMT",pattern = "HH:mm")
+    @JsonFormat(timezone = "GMT+8",pattern = "HH:mm")
     @DateTimeFormat(pattern="HH:mm")
     private Date startTime;
     /**场所明细*/
     @Schema(description = "场所结束时间")
-    @JsonFormat(timezone = "GMT",pattern = "HH:mm")
+    @JsonFormat(timezone = "GMT+8",pattern = "HH:mm")
     @DateTimeFormat(pattern="HH:mm")
     private Date endTime;
     /**当天场次已预约数*/

+ 2 - 2
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/hikiot/dto/AddUserRequestDTO.java

@@ -41,11 +41,11 @@ public class AddUserRequestDTO {
         @Schema(description = "用户类型")
         private String userType;
 
-        @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd'T'HH:mm:ss")
+        @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd'T'HH:mm:ss")
         @Schema(description = "启用开始时间")
         private String enableBeginTime;
 
-        @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd'T'HH:mm:ss")
+        @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd'T'HH:mm:ss")
         @Schema(description = "启用结束时间")
         private String enableEndTime;
 

+ 1 - 1
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/message/entity/SysMessage.java

@@ -44,7 +44,7 @@ public class SysMessage extends JeecgEntity {
 	private String esSendStatus;
 	/**推送时间*/
 	@Excel(name = "推送时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
 	private java.util.Date esSendTime;
 	/**消息标题*/

+ 2 - 2
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/quartz/entity/QuartzJob.java

@@ -31,7 +31,7 @@ public class QuartzJob implements Serializable {
 	/**创建人*/
 	private String createBy;
 	/**创建时间*/
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
 	private java.util.Date createTime;
 	/**删除状态*/
@@ -39,7 +39,7 @@ public class QuartzJob implements Serializable {
 	/**修改人*/
 	private String updateBy;
 	/**修改时间*/
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
 	private java.util.Date updateTime;
 	/**任务类名*/

+ 1 - 1
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/quartz/vo/JobClassNoticeVo.java

@@ -30,7 +30,7 @@ public class JobClassNoticeVo {
     private String userOpenId;
 
     /** 上课开始时间*/
-    @JsonFormat(timezone = "GMT",shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date startTime;
 

+ 1 - 1
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/quartz/vo/JobReservationSiteVo.java

@@ -23,7 +23,7 @@ public class JobReservationSiteVo {
     private String userOpenId;
 
     /** 开始时间*/
-    @JsonFormat(timezone = "GMT",shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date startTime;
 

+ 2 - 2
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/dto/AppCoursesCuDTO.java

@@ -89,13 +89,13 @@ public class AppCoursesCuDTO {
     private String details;
     /**开始时间*/
     @Excel(name = "开始时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "开始时间")
     private Date startTime;
     /**结束时间*/
     @Excel(name = "结束时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "结束时间")
     private Date endTime;

+ 2 - 2
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/dto/AppCoursesInfoPageDTO.java

@@ -54,12 +54,12 @@ public class AppCoursesInfoPageDTO implements Serializable {
     @Schema(description = "售价")
     private BigDecimal sellingPrice;
     /**开始时间*/
-    @JsonFormat(timezone = "GMT",pattern = "MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "开始时间")
     private Date startTime;
     /**结束时间*/
-    @JsonFormat(timezone = "GMT",pattern = "MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "结束时间")
     private Date endTime;

+ 2 - 2
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/dto/AppCoursesRuleDTO.java

@@ -38,13 +38,13 @@ public class AppCoursesRuleDTO {
     private Integer sort;
     /**开始时间*/
     @Excel(name = "开始时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "开始时间")
     private Date startTime;
     /**结束时间*/
     @Excel(name = "结束时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "结束时间")
     private Date endTime;

+ 3 - 3
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/dto/AppGameCuDTO.java

@@ -51,7 +51,7 @@ public class AppGameCuDTO {
     @Schema(description = "比赛地址")
     private String address;
     /**报名截止时间*/
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "报名截止时间")
     private Date applicationEndTime;
@@ -59,12 +59,12 @@ public class AppGameCuDTO {
     @Schema(description = "保险id;可能有多个险种")
     private String insureIds;
     /**开始时间*/
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @Schema(description = "开始时间")
     private Date startTime;
     /**结束时间*/
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @Schema(description = "结束时间")
     private Date endTime;

+ 2 - 2
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/dto/AppGameScheduleDTO.java

@@ -29,12 +29,12 @@ public class AppGameScheduleDTO {
     @Schema(description = "比赛名称")
     private String name;
     /**开始时间*/
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "开始时间")
     private Date startTime;
     /**结束时间*/
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "结束时间")
     private Date endTime;

+ 2 - 2
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/dto/AppSiteDTO.java

@@ -73,13 +73,13 @@ public class AppSiteDTO {
     private Integer runType;
     /**开始营业时间 */
     @Excel(name = "开始营业时间", width = 20, format = "HH:mm:ss")
-    @JsonFormat(timezone = "GMT",pattern = "HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "HH:mm:ss")
     @DateTimeFormat(pattern="HH:mm:ss")
     @Schema(description = "开始营业时间")
     private Date startTime;
     /**结束营业时间*/
     @Excel(name = "结束营业时间", width = 20, format = "HH:mm:ss")
-    @JsonFormat(timezone = "GMT",pattern = "HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "HH:mm:ss")
     @DateTimeFormat(pattern="HH:mm:ss")
     @Schema(description = "结束营业时间")
     private Date endTime;    /**客服电话*/

+ 2 - 2
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/dto/AppSiteRuleDTO.java

@@ -34,12 +34,12 @@ public class AppSiteRuleDTO {
     @Schema(description = "运动类型")
     private String categoryId;
     /**开始时间*/
-    @JsonFormat(timezone = "GMT",pattern = "HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "HH:mm:ss")
     @DateTimeFormat(pattern="HH:mm:ss")
     @Schema(description = "开始时间")
     private Date startTime;
     /**结束时间*/
-    @JsonFormat(timezone = "GMT",pattern = "HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "HH:mm:ss")
     @DateTimeFormat(pattern="HH:mm:ss")
     @Schema(description = "结束时间")
     private Date endTime;

+ 2 - 2
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/dto/AppSiteRuleTimeDTO.java

@@ -30,13 +30,13 @@ public class AppSiteRuleTimeDTO implements Serializable {
     private String id;
     /**开始时间*/
     @Excel(name = "开始时间", width = 20, format = "HH:mm:ss")
-    @JsonFormat(timezone = "GMT",pattern = "HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "HH:mm:ss")
     @DateTimeFormat(pattern="HH:mm:ss")
     @Schema(description = "开始时间")
     private Date startTime;
     /**结束时间*/
     @Excel(name = "结束时间", width = 20, format = "HH:mm:ss")
-    @JsonFormat(timezone = "GMT",pattern = "HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "HH:mm:ss")
     @DateTimeFormat(pattern="HH:mm:ss")
     @Schema(description = "结束时间")
     private Date endTime;

+ 2 - 2
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/dto/AppSiteRuleTimeFormDTO.java

@@ -31,13 +31,13 @@ public class AppSiteRuleTimeFormDTO implements Serializable {
     private String id;
     /**开始时间*/
     @Excel(name = "开始时间", width = 20, format = "HH:mm:ss")
-    @JsonFormat(timezone = "GMT",pattern = "HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "HH:mm:ss")
     @DateTimeFormat(pattern="HH:mm:ss")
     @Schema(description = "开始时间")
     private Date startTime;
     /**结束时间*/
     @Excel(name = "结束时间", width = 20, format = "HH:mm:ss")
-    @JsonFormat(timezone = "GMT",pattern = "HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "HH:mm:ss")
     @DateTimeFormat(pattern="HH:mm:ss")
     @Schema(description = "结束时间")
     private Date endTime;

+ 1 - 1
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/dto/AppTeachingTimeDTO.java

@@ -23,7 +23,7 @@ public class AppTeachingTimeDTO {
     private String tenantId;
     /**日期*/
     @Excel(name = "日期", width = 15, format = "yyyy-MM-dd")
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @Schema(description = "日期")
     private Date day;

+ 4 - 4
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/dto/ContractSignDTO.java

@@ -14,10 +14,10 @@ import java.util.Date;
 public class ContractSignDTO{
     public Integer pageNo;
     public Integer pageSize;
-    @JsonFormat(timezone = "GMT",pattern = "MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "MM-dd")
     @DateTimeFormat(pattern="MM-dd")
     private Date startTime;
-    @JsonFormat(timezone = "GMT",pattern = "MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "MM-dd")
     @DateTimeFormat(pattern="MM-dd")
     private Date endTime;
     @Schema(description = "关联产品名称")
@@ -32,11 +32,11 @@ public class ContractSignDTO{
     @Schema(description = "联系电话")
     private String phone;
     private String OrgCode;
-    @JsonFormat(timezone = "GMT",pattern = "MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "MM-dd")
     @DateTimeFormat(pattern="MM-dd")
     @Schema(description = "创建时间(合同签约记录创建时间)")
     private Date createTime;
-    @JsonFormat(timezone = "GMT",pattern = "MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "MM-dd")
     @DateTimeFormat(pattern="MM-dd")
     @Schema(description = "签约完成时间")
     private Date signTime;

+ 2 - 2
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/dto/ExportConditionDTO.java

@@ -14,11 +14,11 @@ public class ExportConditionDTO {
     private String gameId;
     @Schema(description = "项目ID")
     private String projectId;
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "开始时间")
     private String startTime;
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "结束时间")
     private String endTime;

+ 1 - 1
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/dto/FindPageCUserInfoResponseDTO.java

@@ -38,7 +38,7 @@ public class FindPageCUserInfoResponseDTO {
     @Schema(description = "家庭成员数(包括自己)")
     private Integer familyNum;
     /**创建时间*/
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建时间")
     private Date createTime;

+ 1 - 1
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/dto/FindResponseDTO.java

@@ -63,7 +63,7 @@ public class FindResponseDTO {
     private String avatar;
 
     /**创建时间*/
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建时间")
     private Date createTime;

+ 3 - 3
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/dto/evaluate/FindEvaluateResponseDTO.java

@@ -65,7 +65,7 @@ public class FindEvaluateResponseDTO {
     @Schema(description = "回复内容")
     private String replyContent;
     /**回复时间*/
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "回复时间")
     private Date replyTime;
@@ -73,12 +73,12 @@ public class FindEvaluateResponseDTO {
     @Schema(description = "业务类型;0场地 1课程")
     private Integer type;
     /**创建时间;创建时间*/
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建时间;创建时间")
     private Date createTime;
     /**更新时间;更新时间*/
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新时间;更新时间")
     private Date updateTime;

+ 3 - 3
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/dto/insureOrder/FindInsureOrderPageResponseDTO.java

@@ -48,13 +48,13 @@ public class FindInsureOrderPageResponseDTO{
     private String identityCard;
     /**生效开始时间*/
     @Excel(name = "生效开始时间", width = 20, format = "yyyy-MM-dd")
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @Schema(description = "生效开始时间")
     private Date assertStartTime;
     /**生效结束时间*/
     @Excel(name = "生效结束时间", width = 20, format = "yyyy-MM-dd")
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @Schema(description = "生效结束时间")
     private Date assertEndTime;
@@ -64,7 +64,7 @@ public class FindInsureOrderPageResponseDTO{
     private Integer isEnterSystem;
     /**创建时间;创建时间*/
     @Excel(name = "付款时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "付款时间")
     private Date payTime;

+ 1 - 1
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/dto/merchant/FindMerchantResponseDTO.java

@@ -37,7 +37,7 @@ public class FindMerchantResponseDTO {
     @Schema(description = "管理员手机号")
     private String phone;
     /**创建时间;创建时间*/
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建时间;创建时间")
     private Date createTime;

+ 2 - 2
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/dto/receiptPaymentDetails/ReceiptPaymentDetailsInfoVo.java

@@ -67,12 +67,12 @@ public class ReceiptPaymentDetailsInfoVo {
     @Max(value = 3, message = "资金变化原因最大值为3")
     private Integer purseChangeReason;
 	/**创建时间;创建时间*/
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建时间;创建时间")
     private Date createTime=new Date();
 	/**更新时间;更新时间*/
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新时间;更新时间")
     private Date updateTime =new Date();

+ 1 - 1
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/dto/separateAccounts/FindAccountResponseDTO.java

@@ -40,7 +40,7 @@ public class FindAccountResponseDTO {
     @Schema(description = "分账状态 0-启用 1-停用  默认启用")
     private Integer accountStatus;
     /**更新时间*/
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新时间")
     private Date updateTime;

+ 2 - 2
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/AppBanner.java

@@ -58,7 +58,7 @@ public class AppBanner implements Serializable {
     @Schema(description = "创建人")
     private String createBy;
 	/**创建日期*/
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建日期")
     private java.util.Date createTime;
@@ -66,7 +66,7 @@ public class AppBanner implements Serializable {
     @Schema(description = "更新人")
     private String updateBy;
 	/**更新日期*/
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新日期")
     private java.util.Date updateTime;

+ 2 - 2
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/AppCategory.java

@@ -61,7 +61,7 @@ public class AppCategory implements Serializable {
     @Schema(description = "创建人;创建人")
     private String createBy;
 	/**创建时间;创建时间*/
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建时间;创建时间")
     private Date createTime;
@@ -69,7 +69,7 @@ public class AppCategory implements Serializable {
     @Schema(description = "更新人;更新人")
     private String updateBy;
 	/**更新时间;更新时间*/
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新时间;更新时间")
     private Date updateTime;

+ 2 - 2
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/AppContractInfo.java

@@ -42,7 +42,7 @@ public class AppContractInfo {
     @Schema(description = "创建人;创建人")
     private String createBy;
     /**创建时间;创建时间*/
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建时间;创建时间")
     private Date createTime;
@@ -50,7 +50,7 @@ public class AppContractInfo {
     @Schema(description = "更新人;更新人")
     private String updateBy;
     /**更新时间;更新时间*/
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新时间;更新时间")
     private Date updateTime;

+ 3 - 3
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/AppContractSign.java

@@ -31,11 +31,11 @@ public class AppContractSign {
     private int isSign;
     @Schema(description = "使用人ID")
     private String familyId;
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "签字时间;签字时间")
     private Date signTime;
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建时间;创建时间")
     private Date createTime;
@@ -43,7 +43,7 @@ public class AppContractSign {
     @Schema(description = "删除标志;删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新时间;更新时间")
     private Date updateTime;

+ 4 - 4
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/AppCourses.java

@@ -92,13 +92,13 @@ public class AppCourses implements Serializable {
     private java.lang.String details;
     /**开始时间*/
     @Excel(name = "开始时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "开始时间")
     private java.util.Date startTime;
     /**结束时间*/
     @Excel(name = "结束时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "结束时间")
     private java.util.Date endTime;
@@ -148,7 +148,7 @@ public class AppCourses implements Serializable {
     @Schema(description = "创建人;创建人")
     private java.lang.String createBy;
     /**创建时间;创建时间*/
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建时间;创建时间")
     private java.util.Date createTime;
@@ -156,7 +156,7 @@ public class AppCourses implements Serializable {
     @Schema(description = "更新人;更新人")
     private java.lang.String updateBy;
     /**更新时间;更新时间*/
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新时间;更新时间")
     private java.util.Date updateTime;

+ 4 - 4
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/AppCoursesPriceRules.java

@@ -55,13 +55,13 @@ public class AppCoursesPriceRules implements Serializable {
     private Integer sort;
 	/**开始时间*/
 	@Excel(name = "开始时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "开始时间")
     private Date startTime;
 	/**结束时间*/
 	@Excel(name = "结束时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "结束时间")
     private Date endTime;
@@ -83,7 +83,7 @@ public class AppCoursesPriceRules implements Serializable {
     @Schema(description = "创建人;创建人")
     private String createBy;
 	/**创建时间;创建时间*/
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建时间;创建时间")
     private Date createTime;
@@ -91,7 +91,7 @@ public class AppCoursesPriceRules implements Serializable {
     @Schema(description = "更新人;更新人")
     private String updateBy;
 	/**更新时间;更新时间*/
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新时间;更新时间")
     private Date updateTime;

+ 5 - 5
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/AppCoursesVerificationRecord.java

@@ -76,13 +76,13 @@ public class AppCoursesVerificationRecord implements Serializable {
      * 上课时间
      */
     @Excel(name = "上课时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Schema(description = "上课时间")
     private Date coursesStartTime;
 
     @Excel(name = "上课时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Schema(description = "上课时间")
     private Date coursesEndTime;
@@ -150,7 +150,7 @@ public class AppCoursesVerificationRecord implements Serializable {
      * 核验时间
      */
     @Excel(name = "核验时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Schema(description = "核验时间")
     private Date verifyTime;
@@ -168,7 +168,7 @@ public class AppCoursesVerificationRecord implements Serializable {
     /**
      * 创建时间;创建时间
      */
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建时间;创建时间")
     private Date createTime;
@@ -180,7 +180,7 @@ public class AppCoursesVerificationRecord implements Serializable {
     /**
      * 更新时间;更新时间
      */
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新时间;更新时间")
     private Date updateTime;

+ 2 - 2
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/AppDevice.java

@@ -64,7 +64,7 @@ public class AppDevice implements Serializable {
     @Schema(description = "创建人;创建人")
     private String createBy;
 	/**创建时间;创建时间*/
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建时间;创建时间")
     private Date createTime;
@@ -74,7 +74,7 @@ public class AppDevice implements Serializable {
     @Schema(description = "设备密码")
     private String validateCode;
 	/**更新时间;更新时间*/
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新时间;更新时间")
     private Date updateTime;

+ 3 - 3
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/AppEvaluate.java

@@ -75,7 +75,7 @@ public class AppEvaluate implements Serializable {
     private String replyContent;
 	/**回复时间*/
 	@Excel(name = "回复时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "回复时间")
     private Date replyTime;
@@ -91,7 +91,7 @@ public class AppEvaluate implements Serializable {
     @Schema(description = "创建人;创建人")
     private String createBy;
 	/**创建时间;创建时间*/
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建时间;创建时间")
     private Date createTime;
@@ -99,7 +99,7 @@ public class AppEvaluate implements Serializable {
     @Schema(description = "更新人;更新人")
     private String updateBy;
 	/**更新时间;更新时间*/
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新时间;更新时间")
     private Date updateTime;

+ 2 - 2
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/AppFeedback.java

@@ -62,7 +62,7 @@ public class AppFeedback implements Serializable {
     @Schema(description = "回复人id")
     private String replyUserId;
 	/**创建时间*/
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建时间")
     private Date createTime;
@@ -70,7 +70,7 @@ public class AppFeedback implements Serializable {
     @Schema(description = "修改人")
     private String updateBy;
 	/**修改时间*/
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "修改时间")
     private Date updateTime;

+ 5 - 5
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/AppGame.java

@@ -61,7 +61,7 @@ public class AppGame implements Serializable {
     private String address;
 	/**报名截止时间*/
 	@Excel(name = "报名截止时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "报名截止时间")
     private Date applicationEndTime;
@@ -71,13 +71,13 @@ public class AppGame implements Serializable {
     private String insureIds;
 	/**开始时间*/
 	@Excel(name = "开始时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "开始时间")
     private Date startTime;
 	/**结束时间*/
 	@Excel(name = "结束时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "结束时间")
     private Date endTime;
@@ -106,7 +106,7 @@ public class AppGame implements Serializable {
     @Schema(description = "创建人;创建人")
     private String createBy;
 	/**创建时间;创建时间*/
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建时间;创建时间")
     private Date createTime;
@@ -114,7 +114,7 @@ public class AppGame implements Serializable {
     @Schema(description = "更新人;更新人")
     private String updateBy;
 	/**更新时间;更新时间*/
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新时间;更新时间")
     private Date updateTime;

+ 2 - 2
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/AppGamePriceRules.java

@@ -73,7 +73,7 @@ public class AppGamePriceRules implements Serializable {
     @Schema(description = "创建人;创建人")
     private String createBy;
 	/**创建时间;创建时间*/
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建时间;创建时间")
     private Date createTime;
@@ -81,7 +81,7 @@ public class AppGamePriceRules implements Serializable {
     @Schema(description = "更新人;更新人")
     private String updateBy;
 	/**更新时间;更新时间*/
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新时间;更新时间")
     private Date updateTime;

+ 4 - 4
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/AppGameSchedule.java

@@ -50,13 +50,13 @@ public class AppGameSchedule implements Serializable {
     private String name;
 	/**开始时间*/
 	@Excel(name = "开始时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "开始时间")
     private Date startTime;
 	/**结束时间*/
 	@Excel(name = "结束时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "结束时间")
     private Date endTime;
@@ -68,7 +68,7 @@ public class AppGameSchedule implements Serializable {
     @Schema(description = "创建人;创建人")
     private String createBy;
 	/**创建时间;创建时间*/
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建时间;创建时间")
     private Date createTime;
@@ -76,7 +76,7 @@ public class AppGameSchedule implements Serializable {
     @Schema(description = "更新人;更新人")
     private String updateBy;
 	/**更新时间;更新时间*/
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新时间;更新时间")
     private Date updateTime;

+ 3 - 3
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/AppGmtInfo.java

@@ -30,7 +30,7 @@ public class AppGmtInfo {
     @Schema(description = "认证状态")
     private String authResultMsg;
     @Excel(name = "开门时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "开门时间")
     private Date gmtCreate;
@@ -44,11 +44,11 @@ public class AppGmtInfo {
     private String deviceSerial;
     @Schema(description = "设备号")
     private String deviceSerialNo;
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建时间;创建时间")
     private Date createTime;
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新时间;更新时间")
     private Date updateTime;

+ 2 - 2
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/AppHikiotDevice.java

@@ -58,7 +58,7 @@ public class AppHikiotDevice implements Serializable {
     @Schema(description = "创建人;创建人")
     private String createBy;
 	/**创建时间;创建时间*/
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建时间;创建时间")
     private Date createTime;
@@ -66,7 +66,7 @@ public class AppHikiotDevice implements Serializable {
     @Schema(description = "更新人;更新人")
     private String updateBy;
 	/**更新时间;更新时间*/
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新时间;更新时间")
     private Date updateTime;

+ 2 - 2
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/AppInstructor.java

@@ -75,7 +75,7 @@ public class AppInstructor implements Serializable {
     @Schema(description = "创建人;创建人")
     private String createBy;
 	/**创建时间;创建时间*/
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建时间;创建时间")
     private Date createTime;
@@ -83,7 +83,7 @@ public class AppInstructor implements Serializable {
     @Schema(description = "更新人;更新人")
     private String updateBy;
 	/**更新时间;更新时间*/
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新时间;更新时间")
     private Date updateTime;

+ 2 - 2
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/AppInsure.java

@@ -67,7 +67,7 @@ public class AppInsure implements Serializable {
     @Schema(description = "创建人;创建人")
     private String createBy;
 	/**创建时间;创建时间*/
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建时间;创建时间")
     private Date createTime;
@@ -75,7 +75,7 @@ public class AppInsure implements Serializable {
     @Schema(description = "更新人;更新人")
     private String updateBy;
 	/**更新时间;更新时间*/
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新时间;更新时间")
     private Date updateTime;

+ 2 - 2
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/AppInsureNumber.java

@@ -77,7 +77,7 @@ public class AppInsureNumber implements Serializable {
     @Schema(description = "创建人;创建人")
     private String createBy;
 	/**创建时间;创建时间*/
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建时间;创建时间")
     private Date createTime;
@@ -85,7 +85,7 @@ public class AppInsureNumber implements Serializable {
     @Schema(description = "更新人;更新人")
     private String updateBy;
 	/**更新时间;更新时间*/
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新时间;更新时间")
     private Date updateTime;

+ 4 - 4
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/AppIsin.java

@@ -75,7 +75,7 @@ public class AppIsin implements Serializable {
     private String verifyUserName;
 	/**使用时间*/
 	@Excel(name = "使用时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "使用时间")
     private Date useTime;
@@ -92,16 +92,16 @@ public class AppIsin implements Serializable {
     @Schema(description = "创建人;创建人")
     private String createBy;
 	/**创建时间;创建时间*/
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建时间")
     private Date createTime;
 	/**更新时间;更新时间*/
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新时间")
     private Date updateTime;
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @Schema(description = "到期时间")
     private String expireTime;

+ 2 - 2
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/AppKongfuZone.java

@@ -43,7 +43,7 @@ public class AppKongfuZone {
     @Schema(description = "是否展示,1表示展示,0表示不展示")
     private String izShow;
     /**创建时间*/
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建时间")
     private java.util.Date createTime;
@@ -51,7 +51,7 @@ public class AppKongfuZone {
     @Schema(description = "修改人")
     private String updateBy;
     /**修改时间*/
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "修改时间")
     private java.util.Date updateTime;

+ 3 - 3
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/AppOrder.java

@@ -131,7 +131,7 @@ public class AppOrder implements Serializable {
     @Schema(description = "使用人ID")
     private String familyIds;
     @Excel(name = "使用人ID", width = 15)
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Schema(description = "支付时间")
     private Date payTime;
@@ -148,7 +148,7 @@ public class AppOrder implements Serializable {
     @Schema(description = "创建人;创建人")
     private String createBy;
 	/**创建时间;创建时间*/
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建时间;创建时间")
     private Date createTime;
@@ -156,7 +156,7 @@ public class AppOrder implements Serializable {
     @Schema(description = "更新人;更新人")
     private String updateBy;
 	/**更新时间;更新时间*/
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新时间;更新时间")
     private Date updateTime;

+ 2 - 2
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/AppOrderProInfo.java

@@ -94,7 +94,7 @@ public class AppOrderProInfo implements Serializable{
     @Schema(description = "创建人;创建人")
     private String createBy;
     /**创建时间;创建时间*/
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建时间;创建时间")
     private Date createTime;
@@ -102,7 +102,7 @@ public class AppOrderProInfo implements Serializable{
     @Schema(description = "更新人;更新人")
     private String updateBy;
     /**更新时间;更新时间*/
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新时间;更新时间")
     private Date updateTime;

+ 2 - 2
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/AppSearchHot.java

@@ -47,13 +47,13 @@ public class AppSearchHot implements Serializable {
     private String lastUser;
     /**开始时间*/
     @Excel(name = "开始时间", width = 20, format = "yyyy-MM-dd")
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @Schema(description = "开始时间")
     private Date startTime;
     /**结束时间*/
     @Excel(name = "结束时间", width = 20, format = "yyyy-MM-dd")
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @Schema(description = "结束时间")
     private Date endTime;

+ 4 - 4
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/AppSite.java

@@ -76,13 +76,13 @@ public class AppSite implements Serializable {
     private Integer runType;
     /**开始营业时间 时间为空则全天*/
     @Excel(name = "开始营业时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="HH:mm:ss")
     @Schema(description = "开始营业时间")
     private Date startTime;
     /**结束营业时间*/
     @Excel(name = "结束营业时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="HH:mm:ss")
     @Schema(description = "结束营业时间")
     private Date endTime;
@@ -143,7 +143,7 @@ public class AppSite implements Serializable {
     @Schema(description = "创建人;创建人")
     private String createBy;
 	/**创建时间;创建时间*/
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建时间;创建时间")
     private Date createTime;
@@ -151,7 +151,7 @@ public class AppSite implements Serializable {
     @Schema(description = "更新人;更新人")
     private String updateBy;
 	/**更新时间;更新时间*/
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新时间;更新时间")
     private Date updateTime;

+ 2 - 2
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/AppSitePlace.java

@@ -61,7 +61,7 @@ public class AppSitePlace implements Serializable {
     @Schema(description = "创建人;创建人")
     private String createBy;
 	/**创建时间;创建时间*/
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建时间;创建时间")
     private Date createTime;
@@ -69,7 +69,7 @@ public class AppSitePlace implements Serializable {
     @Schema(description = "更新人;更新人")
     private String updateBy;
 	/**更新时间;更新时间*/
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新时间;更新时间")
     private Date updateTime;

+ 5 - 5
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/AppSitePriceRules.java

@@ -56,13 +56,13 @@ public class AppSitePriceRules implements Serializable {
     private Integer type;
     /**开始时间*/
     @Excel(name = "开始时间", width = 20, format = "HH:mm:ss")
-    @JsonFormat(timezone = "GMT",pattern = "HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "HH:mm:ss")
     @DateTimeFormat(pattern="HH:mm:ss")
     @Schema(description = "开始时间")
     private Date startTime;
     /**结束时间*/
     @Excel(name = "结束时间", width = 20, format = "HH:mm:ss")
-    @JsonFormat(timezone = "GMT",pattern = "HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "HH:mm:ss")
     @DateTimeFormat(pattern="HH:mm:ss")
     @Schema(description = "结束时间")
     private Date endTime;
@@ -100,12 +100,12 @@ public class AppSitePriceRules implements Serializable {
     /**创建人;创建人*/
     @Schema(description = "创建人;创建人")
     private String createBy;
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @Schema(description = "销售日期")
     private Date dateOfSale;
     /**创建时间;创建时间*/
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建时间;创建时间")
     private Date createTime;
@@ -113,7 +113,7 @@ public class AppSitePriceRules implements Serializable {
     @Schema(description = "更新人;更新人")
     private String updateBy;
     /**更新时间;更新时间*/
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新时间;更新时间")
     private Date updateTime;

+ 4 - 4
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/AppSiteRuleTime.java

@@ -37,13 +37,13 @@ public class AppSiteRuleTime implements Serializable {
     private String categoryId;
     /**开始时间*/
     @Excel(name = "开始时间", width = 20, format = "HH:mm:ss")
-    @JsonFormat(timezone = "GMT",pattern = "HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "HH:mm:ss")
     @DateTimeFormat(pattern="HH:mm:ss")
     @Schema(description = "开始时间")
     private Date startTime;
     /**结束时间*/
     @Excel(name = "结束时间", width = 20, format = "HH:mm:ss")
-    @JsonFormat(timezone = "GMT",pattern = "HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "HH:mm:ss")
     @DateTimeFormat(pattern="HH:mm:ss")
     @Schema(description = "结束时间")
     private Date endTime;
@@ -55,7 +55,7 @@ public class AppSiteRuleTime implements Serializable {
     @Schema(description = "创建人;创建人")
     private String createBy;
     /**创建时间;创建时间*/
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建时间;创建时间")
     private Date createTime;
@@ -63,7 +63,7 @@ public class AppSiteRuleTime implements Serializable {
     @Schema(description = "更新人;更新人")
     private String updateBy;
     /**更新时间;更新时间*/
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新时间;更新时间")
     private Date updateTime;

+ 3 - 3
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/AppTeachingTime.java

@@ -43,7 +43,7 @@ public class AppTeachingTime implements Serializable {
     private String tenantId;
 	/**日期*/
 	@Excel(name = "日期", width = 15, format = "yyyy-MM-dd")
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @Schema(description = "日期")
     private Date day;
@@ -63,7 +63,7 @@ public class AppTeachingTime implements Serializable {
     @Schema(description = "创建人;创建人")
     private String createBy;
 	/**创建时间;创建时间*/
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建时间;创建时间")
     private Date createTime;
@@ -71,7 +71,7 @@ public class AppTeachingTime implements Serializable {
     @Schema(description = "更新人;更新人")
     private String updateBy;
 	/**更新时间;更新时间*/
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新时间;更新时间")
     private Date updateTime;

+ 3 - 3
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/Evaluate.java

@@ -83,7 +83,7 @@ public class Evaluate implements Serializable {
     private String replyUserId;
 	/**回复时间*/
 	@Excel(name = "回复时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "回复时间")
     private Date replyTime;
@@ -95,7 +95,7 @@ public class Evaluate implements Serializable {
     @Schema(description = "创建人;创建人")
     private String createBy;
 	/**创建时间;创建时间*/
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建时间;创建时间")
     private Date createTime;
@@ -103,7 +103,7 @@ public class Evaluate implements Serializable {
     @Schema(description = "更新人;更新人")
     private String updateBy;
 	/**更新时间;更新时间*/
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新时间;更新时间")
     private Date updateTime;

+ 2 - 2
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/FamilyMembers.java

@@ -72,12 +72,12 @@ public class FamilyMembers implements Serializable {
     @Schema(description = "用户类型0-本人;1-家人")
     private Integer userType;
 	/**创建时间*/
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建时间")
     private Date createTime;
 	/**修改时间*/
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "修改时间")
     private Date updateTime;

+ 5 - 5
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/InsureOrderInfo.java

@@ -77,13 +77,13 @@ public class InsureOrderInfo implements Serializable {
      * 生效开始时间
      */
 	@Excel(name = "生效开始时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "生效开始时间")
     private Date assertStartTime;
 	/**生效结束时间*/
 	@Excel(name = "生效结束时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "生效结束时间")
     private Date assertEndTime;
@@ -92,17 +92,17 @@ public class InsureOrderInfo implements Serializable {
     @Schema(description = "是否录入系统 0-否 1-是")
     private Integer isEnterSystem;
 	/**创建时间*/
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建时间")
     private Date createTime;
 	/**修改时间*/
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "修改时间")
     private Date updateTime;
 	/**修改人*/
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "修改人")
     private Date updateBy;

+ 2 - 2
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/InsurePrice.java

@@ -50,7 +50,7 @@ public class InsurePrice implements Serializable {
     @Schema(description = "创建人;创建人")
     private String createBy;
 	/**创建时间;创建时间*/
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建时间;创建时间")
     private Date createTime;
@@ -58,7 +58,7 @@ public class InsurePrice implements Serializable {
     @Schema(description = "更新人;更新人")
     private String updateBy;
 	/**更新时间;更新时间*/
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新时间;更新时间")
     private Date updateTime;

+ 2 - 2
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/Protocol.java

@@ -60,7 +60,7 @@ public class Protocol implements Serializable {
     @Schema(description = "创建人;创建人")
     private String createBy;
 	/**创建时间;创建时间*/
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建时间;创建时间")
     private Date createTime;
@@ -68,7 +68,7 @@ public class Protocol implements Serializable {
     @Schema(description = "更新人;更新人")
     private String updateBy;
 	/**更新时间;更新时间*/
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新时间;更新时间")
     private Date updateTime;

+ 2 - 2
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/ReceiptPaymentDetailsInfo.java

@@ -76,12 +76,12 @@ public class ReceiptPaymentDetailsInfo implements Serializable {
     @Schema(description = "金额类型 0-待结算,1-可用余额,2-已到账")
     private Integer moneyType;
 	/**创建时间;创建时间*/
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建时间;创建时间")
     private Date createTime;
 	/**更新时间;更新时间*/
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新时间;更新时间")
     private Date updateTime;

+ 2 - 2
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/SeparateAccounts.java

@@ -68,7 +68,7 @@ public class SeparateAccounts implements Serializable {
     @Schema(description = "创建人")
     private String createBy;
 	/**创建时间*/
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建时间")
     private Date createTime;
@@ -76,7 +76,7 @@ public class SeparateAccounts implements Serializable {
     @Schema(description = "更新人")
     private String updateBy;
 	/**更新时间*/
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新时间")
     private Date updateTime;

+ 2 - 2
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/ShopMoney.java

@@ -55,12 +55,12 @@ public class ShopMoney implements Serializable {
     @Schema(description = "已到账金额")
     private BigDecimal receivedAmount;
 	/**创建时间*/
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建时间")
     private Date createTime;
 	/**修改时间*/
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "修改时间")
     private Date updateTime;

+ 2 - 2
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/ShopMoneyHis.java

@@ -58,12 +58,12 @@ public class ShopMoneyHis implements Serializable {
     @Schema(description = "已到账金额")
     private BigDecimal receivedAmount;
 	/**创建时间*/
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建时间")
     private Date createTime;
 	/**修改时间*/
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "修改时间")
     private Date updateTime;

+ 2 - 2
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/StatisticsInfo.java

@@ -66,12 +66,12 @@ public class StatisticsInfo implements Serializable {
     @Schema(description = "商户id")
     private String deptId;
 	/**创建时间*/
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建时间")
     private Date createTime;
 	/**修改时间*/
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "修改时间")
     private Date updateTime;

+ 2 - 2
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/StatisticsInfoHis.java

@@ -70,12 +70,12 @@ public class StatisticsInfoHis implements Serializable {
     @Schema(description = "商户id")
     private String deptId;
 	/**创建时间*/
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建时间")
     private Date createTime;
 	/**修改时间*/
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "修改时间")
     private Date updateTime;

+ 2 - 2
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/form/AppOrderPageForm.java

@@ -39,11 +39,11 @@ public class AppOrderPageForm extends PageDTO implements Serializable {
 
     @Schema(description = "开始时间")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(timezone = "GMT",shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
     private Date startTime;
 
     @Schema(description = "结束时间")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(timezone = "GMT",shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
     private Date endTime;
 }

+ 2 - 2
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/mapper/xml/AppSitePlaceMapper.xml

@@ -88,13 +88,13 @@
                           b.id,b.start_time,b.end_time ,b.selling_price,
                           CASE
                               WHEN c.order_status <=1 THEN 1
-                              WHEN CURRENT_TIME() < TIME(b.end_time) THEN 0
+                              WHEN DATE_ADD(CURRENT_TIME(), INTERVAL 8 HOUR) > TIME(b.end_time) THEN 0
                        ELSE 1
         END AS concertStatus
         from nm_site_place a
         left join  nm_site_price_rules b on a.id = b.site_place_id
         LEFT JOIN nm_order_pro_info c on c.product_id =b.id and c.use_date_str =#{today}
-    where a.site_id = #{siteId} and b.category_id =#{categoryId} and b.day_of_week =#{weekDay}
+    where a.site_id = #{siteId} and b.category_id =#{categoryId} and b.day_of_week =#{weekDay} AND b.del_flag = 0
         ]]>
     </select>
 </mapper>

+ 2 - 2
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/vo/AppOrderInfoVO.java

@@ -38,12 +38,12 @@ public class AppOrderInfoVO implements Serializable {
     @Schema(description = "订单类型:0-学校 1-包场 2-无固定场 3-个人赛 4-团队赛 5-课程")
     private Integer orderType;
 
-    @JsonFormat(timezone = "GMT",shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Schema(description = "下单时间")
     private Date createTime;
 
-    @JsonFormat(timezone = "GMT",shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Schema(description = "付款时间")
     private Date payTime;

+ 2 - 2
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/vo/ContractSignVO.java

@@ -26,11 +26,11 @@ public class ContractSignVO {
 
     @Schema(description = "联系电话")
     private String phone;
-    @JsonFormat(timezone = "GMT",pattern = "MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "MM-dd")
     @DateTimeFormat(pattern="MM-dd")
     @Schema(description = "创建时间(合同签约记录创建时间)")
     private Date createTime;
-    @JsonFormat(timezone = "GMT",pattern = "MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "MM-dd")
     @DateTimeFormat(pattern="MM-dd")
     @Schema(description = "签约完成时间")
     private Date signTime;

+ 1 - 1
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/vo/OrderPageVO.java

@@ -33,7 +33,7 @@ public class OrderPageVO implements Serializable {
     @Schema(description = "平台名称")
     private Integer orderType;
 
-    @JsonFormat(timezone = "GMT",shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建时间")
     private Date createTime;

+ 1 - 1
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/vo/staff/StaffResponseVO.java

@@ -39,7 +39,7 @@ public class StaffResponseVO {
     private String  departName;
 
     /**更新时间;更新时间*/
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建时间")
     private Date createTime;

+ 1 - 1
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/vo/statistics/FindByStatisticsChartVO.java

@@ -23,7 +23,7 @@ public class FindByStatisticsChartVO  {
     @Schema(description = "日期 列如20250813")
     private Integer dateDaily;
     @Schema(description = "日期")
-    @JsonFormat(timezone = "GMT",pattern = "MM/dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "MM/dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private LocalDate dateDailyDate;
 

+ 6 - 6
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/entity/SysAnnouncement.java

@@ -41,14 +41,14 @@ public class SysAnnouncement implements Serializable {
      * 开始时间
      */
     @Excel(name = "开始时间", width = 15, format = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private java.util.Date startTime;
     /**
      * 结束时间
      */
     @Excel(name = "结束时间", width = 15, format = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private java.util.Date endTime;
     /**
@@ -85,14 +85,14 @@ public class SysAnnouncement implements Serializable {
      * 发布时间
      */
     @Excel(name = "发布时间", width = 15, format = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private java.util.Date sendTime;
     /**
      * 撤销时间
      */
     @Excel(name = "撤销时间", width = 15, format = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private java.util.Date cancelTime;
     /**
@@ -106,7 +106,7 @@ public class SysAnnouncement implements Serializable {
     /**
      * 创建时间
      */
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private java.util.Date createTime;
     /**
@@ -116,7 +116,7 @@ public class SysAnnouncement implements Serializable {
     /**
      * 更新时间
      */
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private java.util.Date updateTime;
     /**

+ 3 - 3
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/entity/SysAnnouncementSend.java

@@ -30,19 +30,19 @@ public class SysAnnouncementSend implements Serializable {
 	/**阅读状态(0未读,1已读)*/
 	private Integer readFlag;
 	/**阅读时间*/
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
 	private Date readTime;
 	/**创建人*/
 	private String createBy;
 	/**创建时间*/
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
 	private Date createTime;
 	/**更新人*/
 	private String updateBy;
 	/**更新时间*/
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
 	private Date updateTime;
 

+ 2 - 2
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/entity/SysCategory.java

@@ -35,13 +35,13 @@ public class SysCategory implements Serializable,Comparable<SysCategory>{
 	/**创建人*/
 	private String createBy;
 	/**创建日期*/
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
 	private java.util.Date createTime;
 	/**更新人*/
 	private String updateBy;
 	/**更新日期*/
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
 	private java.util.Date updateTime;
 	/**所属部门*/

+ 2 - 2
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/entity/SysCheckRule.java

@@ -67,7 +67,7 @@ public class SysCheckRule {
      * 更新时间
      */
     @Excel(name = "更新时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新时间")
     private Date updateTime;
@@ -81,7 +81,7 @@ public class SysCheckRule {
      * 创建时间
      */
     @Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建时间")
     private Date createTime;

+ 2 - 2
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/entity/SysComment.java

@@ -66,7 +66,7 @@ public class SysComment implements Serializable {
     @Schema(description = "创建人")
     private String createBy;
 	/**创建日期*/
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建日期")
     private Date createTime;
@@ -74,7 +74,7 @@ public class SysComment implements Serializable {
     @Schema(description = "更新人")
     private String updateBy;
 	/**更新日期*/
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新日期")
     private Date updateTime;

+ 2 - 2
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDataLog.java

@@ -44,7 +44,7 @@ public class SysDataLog implements Serializable {
     /**
      * 创建日期
      */
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
 	private Date createTime;
 
@@ -52,7 +52,7 @@ public class SysDataLog implements Serializable {
      * 更新人登录名称
      */
 	private String updateBy;
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
 
     /**

+ 2 - 2
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDataSource.java

@@ -95,7 +95,7 @@ public class SysDataSource {
     /**
      * 创建日期
      */
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建日期")
     private java.util.Date createTime;
@@ -107,7 +107,7 @@ public class SysDataSource {
     /**
      * 更新日期
      */
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新日期")
     private java.util.Date updateTime;

+ 2 - 2
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepart.java

@@ -79,13 +79,13 @@ public class SysDepart implements Serializable {
 	/**创建人*/
 	private String createBy;
 	/**创建日期*/
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
 	private Date createTime;
 	/**更新人*/
 	private String updateBy;
 	/**更新日期*/
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
 	private Date updateTime;
 	/**租户ID*/

+ 2 - 2
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepartRole.java

@@ -56,7 +56,7 @@ public class SysDepartRole {
 	private String createBy;
 	/**创建时间*/
 	@Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建时间")
 	private Date createTime;
@@ -66,7 +66,7 @@ public class SysDepartRole {
 	private String updateBy;
 	/**更新时间*/
 	@Excel(name = "更新时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新时间")
 	private Date updateTime;

+ 1 - 1
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepartRolePermission.java

@@ -50,7 +50,7 @@ public class SysDepartRolePermission {
 	private String dataRuleIds;
 	/** 操作时间 */
 	@Excel(name = "操作时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
 	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
 	@Schema(description = "操作时间")
 	private Date operateDate;

+ 2 - 2
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/entity/SysFillRule.java

@@ -65,7 +65,7 @@ public class SysFillRule {
      * 修改时间
      */
     @Excel(name = "修改时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Schema(description = "修改时间")
     private java.util.Date updateTime;
@@ -79,7 +79,7 @@ public class SysFillRule {
      * 创建时间
      */
     @Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建时间")
     private java.util.Date createTime;

+ 1 - 1
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/entity/SysFormFile.java

@@ -52,7 +52,7 @@ public class SysFormFile {
 	private String createBy;
 	/**创建日期*/
 	@Excel(name = "创建日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-	@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建日期")
 	private Date createTime;

Some files were not shown because too many files changed in this diff