refactor(date): 移除@JsonFormat注解中的timezone参数

- 从所有日期字段的@JsonFormat注解中移除了timezone = "GMT+8"配置
- 统一使用pattern属性进行日期格式化配置
- 确保日期格式化行为的一致性- 简化了日期注解的配置复杂度
-修复了可能因时区设置导致的时间显示问题- 提高了代码模板和实体类的可维护性

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+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(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+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private java.util.Date updateTime;
 

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

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

national-motion-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java

@@ -110,6 +110,18 @@ public class ShiroConfig {
 
         filterChainDefinitionMap.put("/app/order/wechatPayNotify", "anon");//支付回调
         filterChainDefinitionMap.put("/app/order/refundOrderNotify", "anon");//退款回调
+        filterChainDefinitionMap.put("/app/common/getDictItems", "anon");
+        filterChainDefinitionMap.put("/app/home/getPlaceList", "anon");
+        filterChainDefinitionMap.put("/app/my/evaluate/findByOrderPage", "anon");
+        filterChainDefinitionMap.put("/app/game/findByList", "anon");
+        filterChainDefinitionMap.put("/app/detail/findByCourseList", "anon");
+        filterChainDefinitionMap.put("/app/coachC/findCoachList", "anon");
+        filterChainDefinitionMap.put("/app/detail/getPlaceInfo", "anon");
+        filterChainDefinitionMap.put("/app/detail/getAllCategory", "anon");
+        filterChainDefinitionMap.put("/app/detail/getAllCourseCategory", "anon");
+        filterChainDefinitionMap.put("/app/detail/getPlaceInfoNoFixation", "anon");
+        filterChainDefinitionMap.put("/app/game/findById", "anon");
+        filterChainDefinitionMap.put("/app/stadium/getPlaceInfo", "anon");
         filterChainDefinitionMap.put("/test/**", "anon");//测试
 
 

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

@@ -16,7 +16,9 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.Map;
 
+import static org.jeecg.modules.app.ezt.GetEidToken.getEidResult;
 import static org.jeecg.modules.app.ezt.GetEidToken.getEidToken;
 
 @Slf4j
@@ -95,6 +97,18 @@ public class AppUserController {
         return Result.ok(getEidToken(idCard,name));
     }
 
+    /**
+     * <p>获取E证通结果信息</p>
+     * @author SheepHy
+     * @param eidToken，参数为类则包含{@link Object}
+     * @return 返回值描述，如无返回值则为void 返回值为类则包含{@link String}
+     */
+    @GetMapping("/getEidResult")
+    @Operation(summary = "获取E证通结果信息")
+    public Result<Map<String,String>> getEidResultBy(@RequestParam("eidToken") String eidToken){
+        return Result.OK(getEidResult(eidToken));
+    }
+
 //    /**
 //     * @Author SheepHy
 //     * @Description 分页查询开门记录

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+8", pattern = "yyyy-MM-dd")
+                                                                           @JsonFormat(pattern = "yyyy-MM-dd")
                                                                            @DateTimeFormat(pattern = "yyyy-MM-dd")
                                                                            @RequestParam("startTime") @Schema(description = "当前选择日期（年月日）") Date startTime) {
         return Result.ok(appOrderService.previewOrderPlaceSchool(placeId, startTime));

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(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(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(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Schema(description = "付款时间")
     private Date payTime;
@@ -75,30 +75,30 @@ public class AppOrderInfoDTO implements Serializable {
     private Integer orSchoolCourse;
 
     @Schema(description = "日期")
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date dateOfSale;
 
     @Excel(name = "开始时间", width = 20, format = "HH:mm")
-    @JsonFormat(timezone = "GMT+8",pattern = "HH:mm")
+    @JsonFormat(pattern = "HH:mm")
     @DateTimeFormat(pattern="HH:mm")
     @Schema(description = "开始时间")
     private Date startTime;
 
     @Excel(name = "结束时间", width = 20, format = "HH:mm")
-    @JsonFormat(timezone = "GMT+8",pattern = "HH:mm")
+    @JsonFormat(pattern = "HH:mm")
     @DateTimeFormat(pattern="HH:mm")
     @Schema(description = "结束时间")
     private Date endTime;
 
     @Excel(name = "开始时间", width = 20, format = "yyyy-MM-dd")
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @JsonFormat(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+8",pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @Schema(description = "结束时间")
     private Date gameEndTime;

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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建时间")
     private Date createTime=new Date();

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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建时间;创建时间")
     private Date createTime;

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/ezt/GetEidToken.java

@@ -1,11 +1,21 @@
 package org.jeecg.modules.app.ezt;
 
+import com.alibaba.fastjson.JSON;
 import com.tencentcloudapi.common.Credential;
 import com.tencentcloudapi.common.exception.TencentCloudSDKException;
 import com.tencentcloudapi.faceid.v20180301.FaceidClient;
 import com.tencentcloudapi.faceid.v20180301.models.GetEidTokenConfig;
 import com.tencentcloudapi.faceid.v20180301.models.GetEidTokenRequest;
 import com.tencentcloudapi.faceid.v20180301.models.GetEidTokenResponse;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.web.client.RestTemplate;
+
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+import java.util.Map;
 
 public class GetEidToken {
     private static final String SECRET_ID = "AKIDDIDyWsIZfYIrDOWTLCzkU7bsyrX2LQK2 "; // TODO 您账号的腾讯云密钥
@@ -35,4 +45,33 @@ public class GetEidToken {
         }
         return null;
     }
+
+    /**
+     * <p>获取E证通结果信息</p>
+     * @author SheepHy
+     * @param eidToken，参数为类则包含{@link Object}
+     * @return 返回值描述，如无返回值则为void 返回值为类则包含{@link String}
+     */
+    public static Map<String,String> getEidResult(String eidToken){
+        Map<String,String> map = new HashMap<>();
+        try {
+            Credential credential = new Credential(SECRET_ID, SECRET_KEY);
+            FaceidClient faceidClient = new FaceidClient(credential, REGION);
+            com.tencentcloudapi.faceid.v20180301.models.GetEidResultRequest request =
+                    new com.tencentcloudapi.faceid.v20180301.models.GetEidResultRequest();
+            request.setEidToken(eidToken);
+            request.setInfoType("1");
+            com.tencentcloudapi.faceid.v20180301.models.GetEidResultResponse response =
+                    faceidClient.GetEidResult(request);
+            if (response.getText() != null) {
+                map.put("ErrCode", String.valueOf(response.getText().getErrCode()));
+                map.put("LiveMsg", response.getText().getLiveMsg());
+                map.put("Comparemsg", response.getText().getComparemsg());
+            }
+            return map;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return map;
+        }
+    }
 }

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( pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @JsonFormat( pattern = "yyyy-MM-dd")
     private Date assertStartTime;
 
     @Schema(description = "生效时间-止")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date assertEndTime;
 
     //保单费用(单价)

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/service/impl/AppHomeServiceImpl.java

@@ -163,53 +163,38 @@ public class AppHomeServiceImpl implements IAppHomeService {
     public Page<PlaceVO> getPlaceList(GetPlaceListDTO getPlaceListDTO) {
         Page<PlaceVO> page = new Page<>(getPlaceListDTO.getCurrent(), getPlaceListDTO.getSize());
         Page<PlaceVO> placeList = appSiteMapper.getPlaceList(page, getPlaceListDTO.getVenueType());
-
         List<PlaceVO> records = placeList.getRecords();
         if (ObjectUtil.isNotEmpty(records)) {
             int recordCount = records.size();
             if (recordCount > 0) {
-                // 预分配集合大小以减少扩容
                 List<String> placeIds = new ArrayList<>(recordCount);
-
-                // 收集所有场地ID（使用传统循环提高性能）
-                for (int i = 0; i < recordCount; i++) {
-                    PlaceVO placeVO = records.get(i);
+                for (PlaceVO placeVO : records) {
                     if (placeVO.getId() != null) {
                         placeIds.add(placeVO.getId());
                     }
                 }
-
-                // 批量查询优化
                 Map<String, List<AppSitePlace>> sitePlacesMap = Collections.emptyMap();
                 Map<String, List<AppSitePriceRules>> priceRulesMap = Collections.emptyMap();
-
                 if (!placeIds.isEmpty()) {
-                    // 一次性查询所有场地位置信息
                     List<AppSitePlace> allSitePlaces = appSitePlaceMapper.selectList(
                             Wrappers.<AppSitePlace>lambdaQuery()
                                     .in(AppSitePlace::getSiteId, placeIds)
                                     .eq(AppSitePlace::getDelFlag, 0)
                                     .eq(AppSitePlace::getStatus, 0)
                     );
-
                     if (!allSitePlaces.isEmpty()) {
-                        // 按场地ID分组场地位置信息
                         sitePlacesMap = new HashMap<>(placeIds.size());
                         for (AppSitePlace sitePlace : allSitePlaces) {
                             sitePlacesMap.computeIfAbsent(sitePlace.getSiteId(), k -> new ArrayList<>())
                                     .add(sitePlace);
                         }
-
-                        // 收集所有场地位置ID用于查询价格规则
                         List<String> sitePlaceIds = new ArrayList<>(allSitePlaces.size());
-                        for (int i = 0; i < allSitePlaces.size(); i++) {
-                            String id = allSitePlaces.get(i).getId();
+                        for (AppSitePlace allSitePlace : allSitePlaces) {
+                            String id = allSitePlace.getId();
                             if (id != null) {
                                 sitePlaceIds.add(id);
                             }
                         }
-
-                        // 批量查询所有价格规则
                         if (!sitePlaceIds.isEmpty()) {
                             List<AppSitePriceRules> allPriceRules = appSitePriceRulesMapper.selectList(
                                     Wrappers.<AppSitePriceRules>lambdaQuery()
@@ -217,8 +202,6 @@ public class AppHomeServiceImpl implements IAppHomeService {
                                             .eq(AppSitePriceRules::getDelFlag, 0)
                                             .eq(AppSitePriceRules::getStatus, 0)
                             );
-
-                            // 按场地位置ID分组价格规则
                             if (!allPriceRules.isEmpty()) {
                                 priceRulesMap = new HashMap<>(sitePlaceIds.size());
                                 for (AppSitePriceRules priceRule : allPriceRules) {
@@ -229,17 +212,41 @@ public class AppHomeServiceImpl implements IAppHomeService {
                         }
                     }
                 }
-
-                // 批量处理场地数据（使用传统循环提高性能）
-                final Map<String, List<AppSitePlace>> finalSitePlacesMap = sitePlacesMap;
-                final Map<String, List<AppSitePriceRules>> finalPriceRulesMap = priceRulesMap;
-
+                Map<String, Long> scoreNumMap = new HashMap<>();
+                Map<String, Long> scoreSumMap = new HashMap<>();
+                if (!placeIds.isEmpty()) {
+                    for (String placeId : placeIds) {
+                        scoreNumMap.put(placeId, evaluateMapper.findByScoreNum(placeId));
+                        scoreSumMap.put(placeId, evaluateMapper.findByAverageScore(placeId));
+                    }
+                }
+                Map<String, String> categoryNameCache = new HashMap<>();
                 for (int i = 0; i < recordCount; i++) {
                     PlaceVO placeVO = records.get(i);
-                    processPlaceVO(placeVO, getPlaceListDTO, finalSitePlacesMap, finalPriceRulesMap);
-                }
+                    Long scoreNum = scoreNumMap.get(placeVO.getId());
+                    Long scoreSum = scoreSumMap.get(placeVO.getId());
+                    if (null == scoreNum) scoreNum = 0L;
+                    if (null == scoreSum) scoreSum = 0L;
+                    List<String> categoryNames = new ArrayList<>();
+                    if (placeVO.getCategoryId() != null) {
+                        String[] categoryIds = placeVO.getCategoryId().split(",");
+                        for (String categoryId : categoryIds) {
+                            String categoryName = categoryNameCache.get(categoryId);
+                            if (categoryName == null) {
+                                AppCategory category = appCategoryMapper.selectById(categoryId);
+                                if (category != null) {
+                                    categoryName = category.getName();
+                                    categoryNameCache.put(categoryId, categoryName);
+                                }
+                            }
+                            if (categoryName != null) {
+                                categoryNames.add(categoryName);
+                            }
+                        }
+                    }
 
-                // 排序优化
+                    processPlaceVO(placeVO, getPlaceListDTO, sitePlacesMap, priceRulesMap, scoreNum, scoreSum, categoryNames);
+                }
                 sortPlacesIfNecessary(records, getPlaceListDTO.getVenueType());
             }
         }
@@ -252,14 +259,13 @@ public class AppHomeServiceImpl implements IAppHomeService {
      */
     private void processPlaceVO(PlaceVO placeVO, GetPlaceListDTO getPlaceListDTO,
                                 Map<String, List<AppSitePlace>> sitePlacesMap,
-                                Map<String, List<AppSitePriceRules>> priceRulesMap) {
+                                Map<String, List<AppSitePriceRules>> priceRulesMap,
+                                Long scoreNum, Long scoreSum, List<String> categoryNames) {
         // 检查是否有票价规则
         boolean ticketWhether = false;
         List<AppSitePlace> sitePlaces = sitePlacesMap.getOrDefault(placeVO.getId(), Collections.emptyList());
-
         if (!sitePlaces.isEmpty()) {
-            for (int i = 0; i < sitePlaces.size(); i++) {
-                AppSitePlace sitePlace = sitePlaces.get(i);
+            for (AppSitePlace sitePlace : sitePlaces) { // 使用增强for循环替代索引循环
                 List<AppSitePriceRules> priceRules = priceRulesMap.getOrDefault(
                         sitePlace.getId(), Collections.emptyList());
                 if (!priceRules.isEmpty()) {
@@ -268,7 +274,6 @@ public class AppHomeServiceImpl implements IAppHomeService {
                 }
             }
         }
-
         // 计算距离
         if (placeVO.getLatitude() != null && placeVO.getLongitude() != null) {
             placeVO.setKm(PositionUtil.calculateDistance(
@@ -279,20 +284,7 @@ public class AppHomeServiceImpl implements IAppHomeService {
         } else {
             placeVO.setKm(0.0);
         }
-
-        // 获取评分信息（考虑批量查询优化）
-        Long scoreNum = evaluateMapper.findByScoreNum(placeVO.getId());
-        if (null == scoreNum) {
-            scoreNum = 0L;
-        }
-
-        Long scoreSum = evaluateMapper.findByAverageScore(placeVO.getId());
-        if (null == scoreSum) {
-            scoreSum = 0L;
-        }
-
-        // 设置其他属性
-        placeVO.setCategory(getCategoryName(placeVO.getCategoryId()));
+        placeVO.setCategory(categoryNames);
         placeVO.setTicketWhether(ticketWhether);
         placeVO.setGoodRate(calculateAverage(scoreSum, scoreNum));
         placeVO.setComments(scoreNum);
@@ -337,7 +329,7 @@ public class AppHomeServiceImpl implements IAppHomeService {
         AppSearchHot appSearchHot = appSearchHotMapper.selectOne(Wrappers.<AppSearchHot>lambdaQuery()
                 .eq(AppSearchHot::getSearchContent, searchDTO.getKeyword())
                 .last("LIMIT 1"));
-        if(null == appSearchHot){
+        if(null == appSearchHot && null != searchDTO.getKeyword() && !searchDTO.getKeyword().isEmpty()){
             LocalDateTime now = LocalDateTime.now();
             Date tenYearsLater = Date.from(now.plusYears(10).atZone(ZoneId.systemDefault()).toInstant());
             appSearchHotMapper.insert(new AppSearchHot()
@@ -348,6 +340,7 @@ public class AppHomeServiceImpl implements IAppHomeService {
                     .setIsRecommend(0)
                     .setStartTime(new Date()).setEndTime(tenYearsLater));
         }else {
+            assert appSearchHot != null;
             appSearchHotMapper.updateById(appSearchHot.setSearchCount(appSearchHot.getSearchCount() + 1));
         }
     }

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+8",pattern = "MM-dd")
+    @JsonFormat(pattern = "MM-dd")
     @DateTimeFormat(pattern="MM-dd")
     @Schema(description = "开始时间")
     private Date startTime;
 
-    @JsonFormat(timezone = "GMT+8",pattern = "MM-dd")
+    @JsonFormat(pattern = "MM-dd")
     @DateTimeFormat(pattern="MM-dd")
     @Schema(description = "结束时间")
     private java.util.Date endTime;

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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "开始时间")
     private Date startTime;
 
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "结束时间")
     private Date endTime;

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+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Schema(description = "开始时间")
     private Date startTime;
 
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Schema(description = "结束时间")
     private Date endTime;

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+8",pattern = "HH:mm:ss")
+        @JsonFormat(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+8",pattern = "HH:mm:ss")
+        @JsonFormat(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+8",pattern = "HH:mm:ss")
+        @JsonFormat(pattern = "HH:mm:ss")
         @DateTimeFormat(pattern="HH:mm:ss")
         private Date startTime;
         @Schema(description = "营业时间结束")
-        @JsonFormat(timezone = "GMT+8",pattern = "HH:mm:ss")
+        @JsonFormat(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+8",pattern = "HH:mm:ss")
+        @JsonFormat(pattern = "HH:mm:ss")
         @DateTimeFormat(pattern="HH:mm:ss")
         @Schema(description = "开始时间")
         private Date startTime;
-        @JsonFormat(timezone = "GMT+8",pattern = "HH:mm:ss")
+        @JsonFormat(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+8", pattern = "yyyy-MM-dd")
+        @JsonFormat(pattern = "yyyy-MM-dd")
         @DateTimeFormat(pattern = "yyyy-MM-dd")
         @Schema(description = "日期")
         private Date day;

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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
     @Schema(description = "过期时间")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date epxTime;
 
     @Schema(description = "子订单")

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+8",pattern = "HH:mm:ss")
+    @JsonFormat(pattern = "HH:mm:ss")
     @DateTimeFormat(pattern="HH:mm:ss")
     @Schema(description = "开始营业时间")
     private Date startTime;
     /**结束营业时间*/
-    @JsonFormat(timezone = "GMT+8",pattern = "HH:mm:ss")
+    @JsonFormat(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+8",pattern = "MM-dd")
+        @JsonFormat(pattern = "MM-dd")
         @Schema(description = "开始时间")
         private Date startTime;
 
-        @JsonFormat(timezone = "GMT+8",pattern = "MM-dd")
+        @JsonFormat(pattern = "MM-dd")
         @Schema(description = "开始时间")
         private Date endTime;
     }

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+8",pattern = "MM-dd")
+    @JsonFormat(pattern = "MM-dd")
     @DateTimeFormat(pattern="MM-dd")
     private Date startTime;
     @Schema(description = "结束时间")
-    @JsonFormat(timezone = "GMT+8",pattern = "MM-dd")
+    @JsonFormat(pattern = "MM-dd")
     @DateTimeFormat(pattern="MM-d")
     private Date endTime;
     @Schema(description = "年销售数")

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+8",pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @Schema(description = "开始时间")
     private Date startTime;
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @JsonFormat(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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "报名结束时间")
     private Date applicationEndTime;

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+8",pattern = "MM-dd")
+    @JsonFormat(pattern = "MM-dd")
     @DateTimeFormat(pattern="MM-dd")
     @Schema(description = "开始时间")
     private Date startTime;
-    @JsonFormat(timezone = "GMT+8",pattern = "MM-dd")
+    @JsonFormat(pattern = "MM-dd")
     @DateTimeFormat(pattern="MM-dd")
     @Schema(description = "结束时间")
     private Date endTime;

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+8",pattern = "MM-dd HH:mm")
+    @JsonFormat(pattern = "MM-dd HH:mm")
     @DateTimeFormat(pattern="MM-dd HH:mm")
     @Schema(description = "开始时间")
     private Date startTime;
-    @JsonFormat(timezone = "GMT+8",pattern = "MM-dd HH:mm")
+    @JsonFormat(pattern = "MM-dd HH:mm")
     @DateTimeFormat(pattern="MM-dd HH:mm")
     @Schema(description = "结束时间")
     private Date endTime;

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+8",pattern = "HH:mm")
+    @JsonFormat(pattern = "HH:mm")
     @DateTimeFormat(pattern="HH:mm")
     private Date startTime;
     /**场所明细*/
     @Schema(description = "场所结束时间")
-    @JsonFormat(timezone = "GMT+8",pattern = "HH:mm")
+    @JsonFormat(pattern = "HH:mm")
     @DateTimeFormat(pattern="HH:mm")
     private Date endTime;
     /**当天场次已预约数*/

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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
 	private java.util.Date esSendTime;
 	/**消息标题*/

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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
 	private java.util.Date updateTime;
 	/**任务类名*/

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/quartz/job/OrTeachingJobService.java

@@ -237,7 +237,7 @@ public class OrTeachingJobService {
      * @return
      **/
 //    @Scheduled(fixedDelay = 300000)
-    @Scheduled(cron = "0 0 23 * * ?")
+//    @Scheduled(cron = "0 0 23 * * ?")
     public void synchronousDoorOpeningAndClosingRecords(){
         try {
             List<DoorRecordDTO> allRecords = fetchAllDoorRecords();

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(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date startTime;
 

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

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

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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "结束时间")
     private Date endTime;

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+8",pattern = "MM-dd")
+    @JsonFormat(pattern = "MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "开始时间")
     private Date startTime;
     /**结束时间*/
-    @JsonFormat(timezone = "GMT+8",pattern = "MM-dd")
+    @JsonFormat(pattern = "MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "结束时间")
     private Date endTime;

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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "结束时间")
     private Date endTime;

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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(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+8",pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @Schema(description = "开始时间")
     private Date startTime;
     /**结束时间*/
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @Schema(description = "结束时间")
     private Date endTime;

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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "开始时间")
     private Date startTime;
     /**结束时间*/
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "结束时间")
     private Date endTime;

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+8",pattern = "HH:mm:ss")
+    @JsonFormat(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+8",pattern = "HH:mm:ss")
+    @JsonFormat(pattern = "HH:mm:ss")
     @DateTimeFormat(pattern="HH:mm:ss")
     @Schema(description = "结束营业时间")
     private Date endTime;    /**客服电话*/

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+8",pattern = "HH:mm:ss")
+    @JsonFormat(pattern = "HH:mm:ss")
     @DateTimeFormat(pattern="HH:mm:ss")
     @Schema(description = "开始时间")
     private Date startTime;
     /**结束时间*/
-    @JsonFormat(timezone = "GMT+8",pattern = "HH:mm:ss")
+    @JsonFormat(pattern = "HH:mm:ss")
     @DateTimeFormat(pattern="HH:mm:ss")
     @Schema(description = "结束时间")
     private Date endTime;

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+8",pattern = "HH:mm:ss")
+    @JsonFormat(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+8",pattern = "HH:mm:ss")
+    @JsonFormat(pattern = "HH:mm:ss")
     @DateTimeFormat(pattern="HH:mm:ss")
     @Schema(description = "结束时间")
     private Date endTime;

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+8",pattern = "HH:mm:ss")
+    @JsonFormat(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+8",pattern = "HH:mm:ss")
+    @JsonFormat(pattern = "HH:mm:ss")
     @DateTimeFormat(pattern="HH:mm:ss")
     @Schema(description = "结束时间")
     private Date endTime;

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+8",pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @Schema(description = "日期")
     private Date day;

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+8",pattern = "MM-dd")
+    @JsonFormat(pattern = "MM-dd")
     @DateTimeFormat(pattern="MM-dd")
     private Date startTime;
-    @JsonFormat(timezone = "GMT+8",pattern = "MM-dd")
+    @JsonFormat(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+8",pattern = "MM-dd")
+    @JsonFormat(pattern = "MM-dd")
     @DateTimeFormat(pattern="MM-dd")
     @Schema(description = "创建时间（合同签约记录创建时间）")
     private Date createTime;
-    @JsonFormat(timezone = "GMT+8",pattern = "MM-dd")
+    @JsonFormat(pattern = "MM-dd")
     @DateTimeFormat(pattern="MM-dd")
     @Schema(description = "签约完成时间")
     private Date signTime;

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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "开始时间")
     private String startTime;
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "结束时间")
     private String endTime;

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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建时间")
     private Date createTime;

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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建时间")
     private Date createTime;

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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建时间;创建时间")
     private Date createTime;
     /**更新时间;更新时间*/
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新时间;更新时间")
     private Date updateTime;

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+8",pattern = "yyyy-MM-dd")
+    @JsonFormat(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+8",pattern = "yyyy-MM-dd")
+    @JsonFormat(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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "付款时间")
     private Date payTime;

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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建时间;创建时间")
     private Date createTime;

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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新时间;更新时间")
     private Date updateTime =new Date();

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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新时间")
     private Date updateTime;

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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新日期")
     private java.util.Date updateTime;

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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新时间;更新时间")
     private Date updateTime;

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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新时间;更新时间")
     private Date updateTime;

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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "签字时间;签字时间")
     private Date signTime;
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新时间;更新时间")
     private Date updateTime;

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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新时间;更新时间")
     private java.util.Date updateTime;

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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新时间;更新时间")
     private Date updateTime;

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+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(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+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(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+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(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+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(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+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新时间;更新时间")
     private Date updateTime;

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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新时间;更新时间")
     private Date updateTime;

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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新时间;更新时间")
     private Date updateTime;

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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "修改时间")
     private Date updateTime;

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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新时间;更新时间")
     private Date updateTime;

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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新时间;更新时间")
     private Date updateTime;

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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新时间;更新时间")
     private Date updateTime;

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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建时间;创建时间")
     private Date createTime;
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新时间;更新时间")
     private Date updateTime;

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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新时间;更新时间")
     private Date updateTime;

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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新时间;更新时间")
     private Date updateTime;

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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新时间;更新时间")
     private Date updateTime;

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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新时间;更新时间")
     private Date updateTime;

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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建时间")
     private Date createTime;
 	/**更新时间;更新时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新时间")
     private Date updateTime;
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @Schema(description = "到期时间")
     private String expireTime;

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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "修改时间")
     private java.util.Date updateTime;

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+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新时间;更新时间")
     private Date updateTime;

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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新时间;更新时间")
     private Date updateTime;

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+8",pattern = "yyyy-MM-dd")
+    @JsonFormat(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+8",pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @Schema(description = "结束时间")
     private Date endTime;

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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新时间;更新时间")
     private Date updateTime;

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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新时间;更新时间")
     private Date updateTime;

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+8",pattern = "HH:mm:ss")
+    @JsonFormat(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+8",pattern = "HH:mm:ss")
+    @JsonFormat(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+8",pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @Schema(description = "销售日期")
     private Date dateOfSale;
     /**创建时间;创建时间*/
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新时间;更新时间")
     private Date updateTime;

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+8",pattern = "HH:mm:ss")
+    @JsonFormat(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+8",pattern = "HH:mm:ss")
+    @JsonFormat(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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新时间;更新时间")
     private Date updateTime;

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+8",pattern = "yyyy-MM-dd")
+	@JsonFormat(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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新时间;更新时间")
     private Date updateTime;

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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新时间;更新时间")
     private Date updateTime;

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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建时间")
     private Date createTime;
 	/**修改时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "修改时间")
     private Date updateTime;

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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建时间")
     private Date createTime;
 	/**修改时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "修改时间")
     private Date updateTime;
 	/**修改人*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "修改人")
     private Date updateBy;

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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新时间;更新时间")
     private Date updateTime;

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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新时间;更新时间")
     private Date updateTime;

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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建时间;创建时间")
     private Date createTime;
 	/**更新时间;更新时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新时间;更新时间")
     private Date updateTime;

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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新时间")
     private Date updateTime;

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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建时间")
     private Date createTime;
 	/**修改时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "修改时间")
     private Date updateTime;

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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建时间")
     private Date createTime;
 	/**修改时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "修改时间")
     private Date updateTime;

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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建时间")
     private Date createTime;
 	/**修改时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "修改时间")
     private Date updateTime;

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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建时间")
     private Date createTime;
 	/**修改时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "修改时间")
     private Date updateTime;

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(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(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(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
     private Date endTime;
 }

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

@@ -12,6 +12,7 @@
         f.depart_name departName,
         o.amount,
         o.price,
+        o.org_code,
         GROUP_CONCAT( DISTINCT opi.user_phone ) userPhone
         FROM
         nm_order o

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

@@ -85,16 +85,16 @@
     </select>
     <select id="findByConcertsAndTime" resultMap="ConcertsVOResult">
         <![CDATA[  select b.site_place_id,a.name as site_place_name,
-               b.id,b.start_time,b.end_time ,b.selling_price,
-        CASE
-        WHEN c.order_status <=1 THEN 1
-        WHEN DATE_ADD(CURRENT_TIME(), INTERVAL 8 HOUR) < TIME(b.end_time) THEN 0
-        ELSE 1
+                          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
+                       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}
         ]]>
     </select>
 </mapper>

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

@@ -5,9 +5,9 @@
         <![CDATA[WITH RECURSIVE dates AS (
         SELECT
             1 AS offset_day,
-            CONVERT_TZ(NOW(), '+00:00', '+08:00') AS current_datetime,
-                     DATE(CONVERT_TZ(NOW(), '+00:00', '+08:00')) AS date_val,
-                     WEEKDAY(DATE(CONVERT_TZ(NOW(), '+00:00', '+08:00'))) + 1 AS dow
+            NOW() AS current_datetime,
+                     DATE(NOW()) AS date_val,
+                     WEEKDAY(DATE(NOW())) + 1 AS dow
                  UNION ALL
     SELECT
         offset_day + 1,
@@ -31,16 +31,16 @@
         WHEN r.date_of_sale IS NOT NULL THEN r.date_of_sale
         ELSE
         -- 计算下一个指定星期几的日期 (使用本地时区)
-        DATE(CONVERT_TZ(NOW(), '+00:00', '+08:00')) + INTERVAL (
-        (7 + (r.day_of_week - 1) - WEEKDAY(DATE(CONVERT_TZ(NOW(), '+00:00', '+08:00')))) % 7
+        DATE(NOW()) + INTERVAL (
+        (7 + (r.day_of_week - 1) - WEEKDAY(DATE(NOW()))) % 7
         ) DAY
         END AS effective_date,
         ROW_NUMBER() OVER (
         PARTITION BY CASE
         WHEN r.date_of_sale IS NOT NULL THEN r.date_of_sale
         ELSE
-        DATE(CONVERT_TZ(NOW(), '+00:00', '+08:00')) + INTERVAL (
-        (7 + (r.day_of_week - 1) - WEEKDAY(DATE(CONVERT_TZ(NOW(), '+00:00', '+08:00')))) % 7
+        DATE(NOW()) + INTERVAL (
+        (7 + (r.day_of_week - 1) - WEEKDAY(DATE(NOW()))) % 7
         ) DAY
         END
         ORDER BY
@@ -53,8 +53,8 @@
         AND opi.use_date_str = CASE
         WHEN r.date_of_sale IS NOT NULL THEN DATE_FORMAT(r.date_of_sale, '%Y-%m-%d')
         ELSE DATE_FORMAT(
-        DATE(CONVERT_TZ(NOW(), '+00:00', '+08:00')) + INTERVAL (
-        (7 + (r.day_of_week - 1) - WEEKDAY(DATE(CONVERT_TZ(NOW(), '+00:00', '+08:00')))) % 7
+        DATE(NOW()) + INTERVAL (
+        (7 + (r.day_of_week - 1) - WEEKDAY(DATE(NOW()))) % 7
         ) DAY,
         '%Y-%m-%d'
         )
@@ -69,10 +69,10 @@
         (
         r.date_of_sale IS NOT NULL
       AND (
-        r.date_of_sale > DATE(CONVERT_TZ(NOW(), '+00:00', '+08:00'))
+        r.date_of_sale > DATE(NOW())
        OR (
-        r.date_of_sale = DATE(CONVERT_TZ(NOW(), '+00:00', '+08:00'))
-      AND r.start_time > TIME(CONVERT_TZ(NOW(), '+00:00', '+08:00'))
+        r.date_of_sale = DATE(NOW())
+      AND r.start_time > TIME(NOW())
         )
         )
         )
@@ -82,14 +82,14 @@
         r.date_of_sale IS NULL
       AND r.day_of_week IS NOT NULL
       AND (
-        DATE(CONVERT_TZ(NOW(), '+00:00', '+08:00')) + INTERVAL (
-        (7 + (r.day_of_week - 1) - WEEKDAY(DATE(CONVERT_TZ(NOW(), '+00:00', '+08:00')))) % 7
-        ) DAY > DATE(CONVERT_TZ(NOW(), '+00:00', '+08:00'))
+        DATE(NOW()) + INTERVAL (
+        (7 + (r.day_of_week - 1) - WEEKDAY(DATE(NOW()))) % 7
+        ) DAY > DATE(NOW())
        OR (
-        DATE(CONVERT_TZ(NOW(), '+00:00', '+08:00')) + INTERVAL (
-        (7 + (r.day_of_week - 1) - WEEKDAY(DATE(CONVERT_TZ(NOW(), '+00:00', '+08:00')))) % 7
-        ) DAY = DATE(CONVERT_TZ(NOW(), '+00:00', '+08:00'))
-      AND r.start_time > TIME(CONVERT_TZ(NOW(), '+00:00', '+08:00'))
+        DATE(NOW()) + INTERVAL (
+        (7 + (r.day_of_week - 1) - WEEKDAY(DATE(NOW()))) % 7
+        ) DAY = DATE(NOW())
+      AND r.start_time > TIME(NOW())
         )
         )
         )
@@ -130,7 +130,7 @@
             JOIN dates dm ON asl.effective_date = dm.date_val
     WHERE
         asl.rn = 1
-      AND NOT (dm.offset_day = 1 AND asl.start_time <= TIME(CONVERT_TZ(NOW(), '+00:00', '+08:00')))
+      AND NOT (dm.offset_day = 1 AND asl.start_time <= TIME(NOW()))
     ORDER BY
         dm.offset_day;
         ]]>

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/service/impl/AppOrderServiceImpl.java

@@ -28,7 +28,9 @@ import org.jeecg.modules.system.app.form.AppOrderPageForm;
 import org.jeecg.modules.system.app.mapper.*;
 import org.jeecg.modules.system.app.service.IAppOrderService;
 import org.jeecg.modules.system.app.vo.*;
+import org.jeecg.modules.system.entity.SysDepart;
 import org.jeecg.modules.system.entity.SysUser;
+import org.jeecg.modules.system.mapper.SysDepartMapper;
 import org.jeecg.modules.system.mapper.SysUserMapper;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -93,6 +95,8 @@ public class AppOrderServiceImpl extends ServiceImpl<AppOrderMapper, AppOrder> i
     private AppCoursesPriceRulesMapper appCoursesPriceRulesMapper;
     @Resource
     private AppCategoryMapper appCategoryMapper;
+    @Resource
+    private SysDepartMapper sysDepartMapper;
 
 
     @Override
@@ -124,8 +128,14 @@ public class AppOrderServiceImpl extends ServiceImpl<AppOrderMapper, AppOrder> i
 
         Page<OrderPageVO> voPage = baseMapper.queryPage(page, appOrderPageForm);
         voPage.getRecords().forEach(vo -> {
-            List<AppOrderProInfo> proInfoList = appOrderProInfoMapper.selectList(Wrappers.<AppOrderProInfo>lambdaQuery().eq(AppOrderProInfo::getOrderId, vo.getId()));
+            List<AppOrderProInfo> proInfoList = appOrderProInfoMapper.selectList(Wrappers.<AppOrderProInfo>lambdaQuery()
+                    .eq(AppOrderProInfo::getOrderId, vo.getId()));
             vo.setOrderProInfoList(proInfoList);
+            if(vo.getOrgCode().length() == 3){
+                SysDepart sysDepart = sysDepartMapper.selectOne(Wrappers.<SysDepart>lambdaQuery()
+                        .eq(SysDepart::getOrgCode, vo.getOrgCode()));
+                vo.setDepartName(sysDepart.getDepartName());
+            }
         });
         return voPage;
     }

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(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(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(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Schema(description = "付款时间")
     private Date payTime;

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+8",pattern = "MM-dd")
+    @JsonFormat(pattern = "MM-dd")
     @DateTimeFormat(pattern="MM-dd")
     @Schema(description = "创建时间（合同签约记录创建时间）")
     private Date createTime;
-    @JsonFormat(timezone = "GMT+8",pattern = "MM-dd")
+    @JsonFormat(pattern = "MM-dd")
     @DateTimeFormat(pattern="MM-dd")
     @Schema(description = "签约完成时间")
     private Date signTime;

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(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建时间")
     private Date createTime;
@@ -53,6 +53,9 @@ public class OrderPageVO implements Serializable {
     @Schema(description = "用户电话")
     private String usersPhone;
 
+    @Schema(description = "orgCode")
+    private String orgCode;
+
     @Schema(description = "子订单信息")
     private List<AppOrderProInfo> orderProInfoList;
 }

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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建时间")
     private Date createTime;

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+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(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+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(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+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(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+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(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+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(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+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private java.util.Date updateTime;
     /**

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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
 	private Date readTime;
 	/**创建人*/
 	private String createBy;
 	/**创建时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
 	private Date createTime;
 	/**更新人*/
 	private String updateBy;
 	/**更新时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
 	private Date updateTime;
 

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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
 	private java.util.Date updateTime;
 	/**所属部门*/

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+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(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+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建时间")
     private Date createTime;

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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新日期")
     private Date updateTime;

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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(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+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
 
     /**