refactor(date): 将 Date 类型替换为 LocalDateTime

- 在多个实体类中将 Date 字段改为 LocalDateTime
- 更新相关服务类中的日期处理方法，使用 LocalDateTime 替代 Date
- 优化部分代码，利用 LocalDateTime 的特性进行日期运算

clean_duplicate_imports.sh

@@ -0,0 +1,41 @@
+#!/bin/bash
+
+# 清理重复的LocalDateTime导入
+
+echo "开始清理重复的LocalDateTime导入..."
+
+# 获取所有包含重复LocalDateTime导入的Java文件
+files=$(find src/main/java -name "*.java" -exec grep -l "import java.time.LocalDateTime" {} \;)
+
+for file in $files; do
+    echo "检查文件: $file"
+    
+    # 检查是否有重复的LocalDateTime导入
+    count=$(grep -c "import java.time.LocalDateTime" "$file")
+    
+    if [ "$count" -gt 1 ]; then
+        echo "发现重复导入，正在修复: $file"
+        
+        # 创建临时文件
+        temp_file=$(mktemp)
+        
+        # 移除重复的LocalDateTime导入，只保留第一个
+        awk '
+        /import java\.time\.LocalDateTime/ {
+            if (!seen) {
+                print
+                seen = 1
+            }
+            next
+        }
+        { print }
+        ' "$file" > "$temp_file"
+        
+        # 替换原文件
+        mv "$temp_file" "$file"
+        
+        echo "修复完成: $file"
+    fi
+done
+
+echo "清理重复导入完成！"

final_verification.sh

@@ -0,0 +1,49 @@
+#!/bin/bash
+
+echo "=== 时间格式统一修复最终验证 ==="
+echo
+
+echo "1. 检查是否还有实体类使用Date类型的字段..."
+echo "查找 'private Date' 字段："
+find src/main/java -name "*.java" -path "*/entity/*" -exec grep -Hn "private Date " {} \; | head -10
+
+echo
+echo "2. 检查是否还有重复的LocalDateTime导入..."
+echo "查找重复导入："
+find src/main/java -name "*.java" -exec sh -c 'count=$(grep -c "import java.time.LocalDateTime" "$1"); if [ "$count" -gt 1 ]; then echo "$1: $count 次导入"; fi' _ {} \;
+
+echo
+echo "3. 检查工具类中合理的Date使用..."
+echo "工具类中的Date使用（这些是合理的）："
+find src/main/java -name "*Util.java" -o -name "*Utils.java" -o -name "*Helper.java" | xargs grep -l "Date" | head -5
+
+echo
+echo "4. 检查证书相关类的修复状态..."
+echo "证书服务类："
+if grep -q "convertToLocalDateTime" src/main/java/com/gxwebsoft/common/core/service/CertificateService.java; then
+    echo "✅ CertificateService.java - 已修复"
+else
+    echo "❌ CertificateService.java - 需要检查"
+fi
+
+echo
+echo "5. 检查JWT工具类..."
+if grep -q "import java.util.Date" src/main/java/com/gxwebsoft/common/core/security/JwtUtil.java; then
+    echo "✅ JwtUtil.java - 正确使用Date"
+else
+    echo "❌ JwtUtil.java - 需要检查"
+fi
+
+echo
+echo "6. 统计修复结果..."
+echo "实体类总数："
+find src/main/java -name "*.java" -path "*/entity/*" | wc -l
+
+echo "使用LocalDateTime的实体类数："
+find src/main/java -name "*.java" -path "*/entity/*" -exec grep -l "LocalDateTime" {} \; | wc -l
+
+echo "使用Date的实体类数："
+find src/main/java -name "*.java" -path "*/entity/*" -exec grep -l "import java.util.Date" {} \; | wc -l
+
+echo
+echo "=== 验证完成 ==="

fix_dateutil_issues.sh

@@ -0,0 +1,53 @@
+#!/bin/bash
+
+echo "=== 修复DateUtil与LocalDateTime的兼容性问题 ==="
+echo
+
+# 查找所有使用DateUtil.date()的文件
+files=$(find src/main/java -name "*.java" -exec grep -l "DateUtil.date()" {} \;)
+
+echo "发现以下文件使用了DateUtil.date()："
+for file in $files; do
+    echo "  - $file"
+done
+
+echo
+echo "开始修复..."
+
+for file in $files; do
+    echo "处理文件: $file"
+    
+    # 检查文件是否导入了LocalDateTime
+    if grep -q "import java.time.LocalDateTime" "$file"; then
+        echo "  发现LocalDateTime导入，检查是否需要修复..."
+        
+        # 查找可能的问题模式
+        if grep -q "\.set.*Time(DateUtil\.date())" "$file"; then
+            echo "  发现setXxxTime(DateUtil.date())模式，需要修复"
+            # 替换setXxxTime(DateUtil.date())为setXxxTime(LocalDateTime.now())
+            sed -i '' 's/\.set\([^(]*Time\)(DateUtil\.date())/\.set\1(LocalDateTime.now())/g' "$file"
+            echo "  ✅ 已修复setXxxTime方法调用"
+        fi
+        
+        if grep -q "\.compareTo(DateUtil\.date())" "$file"; then
+            echo "  发现compareTo(DateUtil.date())模式，需要手动检查"
+            echo "  ⚠️  请手动检查此文件中的compareTo调用"
+        fi
+        
+        if grep -q "DateUtil\.offsetDay.*\.compareTo(DateUtil\.date())" "$file"; then
+            echo "  发现复杂的日期比较模式，需要手动修复"
+            echo "  ⚠️  请手动检查此文件中的日期比较逻辑"
+        fi
+    else
+        echo "  未发现LocalDateTime导入，可能是合理的Date使用"
+    fi
+    
+    echo
+done
+
+echo "=== 修复完成 ==="
+echo
+echo "请注意："
+echo "1. 自动修复了简单的setXxxTime(DateUtil.date())调用"
+echo "2. 复杂的日期比较逻辑需要手动检查和修复"
+echo "3. 建议运行测试确保修复正确"

src/main/java/com/gxwebsoft/bszx/controller/BszxPayController.java

@@ -293,7 +293,7 @@ public class BszxPayController extends BaseController {
           order.setPayStatus(true);
           order.setTransactionId(transactionId);
           order.setPayPrice(new BigDecimal(NumberUtil.decimalFormat("0.00", total * 0.01)));
-          order.setExpirationTime(DateUtil.offset(DateUtil.date(), DateField.YEAR, 10));
+          order.setExpirationTime(LocalDateTime.now().plusYears(10));
           System.out.println("实际付款金额 = " + order.getPayPrice());
           return "SUCCESS";
         }

src/main/java/com/gxwebsoft/bszx/entity/BszxBm.java

@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import java.io.Serializable;
-import java.util.Date;
+import java.time.LocalDateTime;
 
 import com.gxwebsoft.cms.entity.CmsArticle;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -133,7 +133,7 @@ public class BszxBm implements Serializable {
     private Integer tenantId;
 
     @Schema(description = "创建时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
     @Schema(description = "文章对象")
     @TableField(exist = false)

src/main/java/com/gxwebsoft/bszx/entity/BszxGrade.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
-import java.util.Date;
+import java.time.LocalDateTime;
 import java.util.List;
 
 import io.swagger.v3.oas.annotations.media.Schema;

src/main/java/com/gxwebsoft/bszx/entity/BszxPay.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import java.io.Serializable;
-import java.util.Date;
+import java.time.LocalDateTime;
 
 import com.gxwebsoft.cms.entity.CmsArticle;
 import com.gxwebsoft.shop.entity.ShopOrder;
@@ -124,7 +124,7 @@ public class BszxPay implements Serializable {
     private Integer tenantId;
 
     @Schema(description = "创建时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
     @Schema(description = "文章")
     @TableField(exist = false)

src/main/java/com/gxwebsoft/bszx/entity/BszxPayRanking.java

@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import java.io.Serializable;
-import java.util.Date;
+import java.time.LocalDateTime;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -60,6 +60,6 @@ public class BszxPayRanking implements Serializable {
     private Integer tenantId;
 
     @Schema(description = "创建时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
 }

src/main/java/com/gxwebsoft/bszx/service/impl/BszxBmServiceImpl.java

@@ -32,7 +32,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
-import java.util.Date;
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**

src/main/java/com/gxwebsoft/cms/controller/CmsWebsiteController.java

@@ -216,12 +216,13 @@ public class CmsWebsiteController extends BaseController {
     HashMap<String, Object> serverTime = buildServerTime();
     website.setServerTime(serverTime);
 
+    LocalDateTime now = LocalDateTime.now();
     // 即将过期(一周内过期的)
-    website.setSoon(DateUtil.offsetDay(website.getExpirationTime(), -30).compareTo(DateUtil.date()));
+    website.setSoon(website.getExpirationTime().minusDays(30).compareTo(now));
     // 是否过期 -1已过期 大于0 未过期
-    website.setExpired(website.getExpirationTime().compareTo(DateUtil.date()));
+    website.setExpired(website.getExpirationTime().compareTo(now));
     // 剩余天数
-    website.setExpiredDays(DateUtil.betweenDay(website.getExpirationTime(), DateUtil.date(), false));
+    website.setExpiredDays((int) java.time.temporal.ChronoUnit.DAYS.between(now, website.getExpirationTime()));
 
     redisUtil.set(key, website, 1L, TimeUnit.DAYS);
     return success(website);

src/main/java/com/gxwebsoft/cms/entity/CmsAd.java

@@ -6,7 +6,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.util.Date;
+import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import java.io.Serializable;
 import java.util.List;
@@ -94,7 +94,7 @@ public class CmsAd implements Serializable {
     private Integer tenantId;
 
     @Schema(description = "创建时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
     public JSONArray getImageList() {
       return JSON.parseArray(this.images);

src/main/java/com/gxwebsoft/cms/entity/CmsAdRecord.java

@@ -2,9 +2,8 @@ package com.gxwebsoft.cms.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.util.Date;
+import java.time.LocalDateTime;
 import java.io.Serializable;
-import java.util.Date;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -52,6 +51,6 @@ public class CmsAdRecord implements Serializable {
     private Integer tenantId;
 
     @Schema(description = "创建时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
 }

src/main/java/com/gxwebsoft/cms/entity/CmsArticle.java

@@ -5,10 +5,9 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 
 import java.math.BigDecimal;
-import java.util.Date;
+import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import java.io.Serializable;
-import java.util.Date;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -87,10 +86,10 @@ public class CmsArticle implements Serializable {
     private BigDecimal price;
 
     @Schema(description = "开始时间")
-    private Date startTime;
+    private LocalDateTime startTime;
 
     @Schema(description = "到期时间")
-    private Date endTime;
+    private LocalDateTime endTime;
 
     @Schema(description = "来源")
     private String source;
@@ -226,10 +225,10 @@ public class CmsArticle implements Serializable {
     private Integer tenantId;
 
     @Schema(description = "创建时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
     @Schema(description = "修改时间")
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
     @Schema(description = "是否更新")
     @TableField(exist = false)

src/main/java/com/gxwebsoft/cms/entity/CmsArticleCategory.java

@@ -2,10 +2,9 @@ package com.gxwebsoft.cms.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.util.Date;
+import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import java.io.Serializable;
-import java.util.Date;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -84,9 +83,9 @@ public class CmsArticleCategory implements Serializable {
     private Integer tenantId;
 
     @Schema(description = "创建时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
     @Schema(description = "修改时间")
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
 }

src/main/java/com/gxwebsoft/cms/entity/CmsArticleComment.java

@@ -2,10 +2,9 @@ package com.gxwebsoft.cms.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.util.Date;
+import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import java.io.Serializable;
-import java.util.Date;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -69,9 +68,9 @@ public class CmsArticleComment implements Serializable {
     private Integer tenantId;
 
     @Schema(description = "创建时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
     @Schema(description = "修改时间")
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
 }

src/main/java/com/gxwebsoft/cms/entity/CmsArticleContent.java

@@ -2,9 +2,8 @@ package com.gxwebsoft.cms.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.util.Date;
+import java.time.LocalDateTime;
 import java.io.Serializable;
-import java.util.Date;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -36,6 +35,6 @@ public class CmsArticleContent implements Serializable {
     private Integer tenantId;
 
     @Schema(description = "创建时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
 }

src/main/java/com/gxwebsoft/cms/entity/CmsArticleCount.java

@@ -2,9 +2,8 @@ package com.gxwebsoft.cms.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.util.Date;
+import java.time.LocalDateTime;
 import java.io.Serializable;
-import java.util.Date;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -37,6 +36,6 @@ public class CmsArticleCount implements Serializable {
     private Integer tenantId;
 
     @Schema(description = "创建时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
 }

src/main/java/com/gxwebsoft/cms/entity/CmsArticleLike.java

@@ -2,9 +2,8 @@ package com.gxwebsoft.cms.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.util.Date;
+import java.time.LocalDateTime;
 import java.io.Serializable;
-import java.util.Date;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -37,6 +36,6 @@ public class CmsArticleLike implements Serializable {
     private Integer tenantId;
 
     @Schema(description = "创建时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
 }

src/main/java/com/gxwebsoft/cms/entity/CmsDesign.java

@@ -3,10 +3,9 @@ package com.gxwebsoft.cms.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.util.Date;
+import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import java.io.Serializable;
-import java.util.Date;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -117,6 +116,6 @@ public class CmsDesign implements Serializable {
     private Integer tenantId;
 
     @Schema(description = "创建时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
 }

src/main/java/com/gxwebsoft/cms/entity/CmsDesignRecord.java

@@ -2,9 +2,8 @@ package com.gxwebsoft.cms.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.util.Date;
+import java.time.LocalDateTime;
 import java.io.Serializable;
-import java.util.Date;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -70,6 +69,6 @@ public class CmsDesignRecord implements Serializable {
     private Integer tenantId;
 
     @Schema(description = "创建时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
 }

src/main/java/com/gxwebsoft/cms/entity/CmsDomain.java

@@ -2,10 +2,9 @@ package com.gxwebsoft.cms.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.util.Date;
+import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import java.io.Serializable;
-import java.util.Date;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -63,9 +62,9 @@ public class CmsDomain implements Serializable {
     private Integer tenantId;
 
     @Schema(description = "创建时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
     @Schema(description = "修改时间")
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
 }

src/main/java/com/gxwebsoft/cms/entity/CmsForm.java

@@ -3,10 +3,9 @@ package com.gxwebsoft.cms.entity;
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.util.Date;
+import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import java.io.Serializable;
-import java.util.Date;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -85,6 +84,6 @@ public class CmsForm implements Serializable {
     private Integer tenantId;
 
     @Schema(description = "创建时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
 }

src/main/java/com/gxwebsoft/cms/entity/CmsFormRecord.java

@@ -2,10 +2,9 @@ package com.gxwebsoft.cms.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.util.Date;
+import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import java.io.Serializable;
-import java.util.Date;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -63,6 +62,6 @@ public class CmsFormRecord implements Serializable {
     private Integer tenantId;
 
     @Schema(description = "创建时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
 }

src/main/java/com/gxwebsoft/cms/entity/CmsLang.java

@@ -2,10 +2,9 @@ package com.gxwebsoft.cms.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.util.Date;
+import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import java.io.Serializable;
-import java.util.Date;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -51,9 +50,9 @@ public class CmsLang implements Serializable {
     private Integer tenantId;
 
     @Schema(description = "创建时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
     @Schema(description = "修改时间")
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
 }

src/main/java/com/gxwebsoft/cms/entity/CmsLangLog.java

@@ -2,9 +2,8 @@ package com.gxwebsoft.cms.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.util.Date;
+import java.time.LocalDateTime;
 import java.io.Serializable;
-import java.util.Date;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -40,6 +39,6 @@ public class CmsLangLog implements Serializable {
     private Integer tenantId;
 
     @Schema(description = "创建时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
 }

src/main/java/com/gxwebsoft/cms/entity/CmsLink.java

@@ -3,10 +3,9 @@ package com.gxwebsoft.cms.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.util.Date;
+import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import java.io.Serializable;
-import java.util.Date;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -70,7 +69,7 @@ public class CmsLink implements Serializable {
     private Integer tenantId;
 
     @Schema(description = "创建时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
     @Schema(description = "栏目名称")
     @TableField(exist = false)

src/main/java/com/gxwebsoft/cms/entity/CmsModel.java

@@ -3,10 +3,9 @@ package com.gxwebsoft.cms.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.util.Date;
+import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import java.io.Serializable;
-import java.util.Date;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -87,9 +86,9 @@ public class CmsModel implements Serializable {
     private Integer tenantId;
 
     @Schema(description = "创建时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
     @Schema(description = "修改时间")
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
 }

src/main/java/com/gxwebsoft/cms/entity/CmsNavigation.java

@@ -3,10 +3,9 @@ package com.gxwebsoft.cms.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.util.Date;
+import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import java.io.Serializable;
-import java.util.Date;
 import java.util.List;
 
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -169,7 +168,7 @@ public class CmsNavigation implements Serializable {
     private Integer tenantId;
 
     @Schema(description = "创建时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
 
     @Schema(description = "页面名称")

src/main/java/com/gxwebsoft/cms/entity/CmsStatistics.java

@@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import java.io.Serializable;
-import java.util.Date;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -116,9 +115,9 @@ public class CmsStatistics implements Serializable {
     private Integer tenantId;
 
     @Schema(description = "创建时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
     @Schema(description = "修改时间")
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
 }

src/main/java/com/gxwebsoft/cms/entity/CmsTemplate.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import java.io.Serializable;
-import java.util.Date;
+import java.time.LocalDateTime;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -87,9 +87,9 @@ public class CmsTemplate implements Serializable {
     private Integer tenantId;
 
     @Schema(description = "创建时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
     @Schema(description = "修改时间")
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
 }

src/main/java/com/gxwebsoft/cms/entity/CmsWebsite.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 
 import java.math.BigDecimal;
-import java.util.Date;
+import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import java.io.Serializable;
 import java.util.HashMap;
@@ -85,7 +85,7 @@ public class CmsWebsite implements Serializable {
     private Integer version;
 
     @Schema(description = "服务到期时间")
-    private Date expirationTime;
+    private LocalDateTime expirationTime;
 
     @Schema(description = "是否到期")
     @TableField(exist = false)
@@ -243,10 +243,10 @@ public class CmsWebsite implements Serializable {
     private Integer tenantId;
 
     @Schema(description = "创建时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
     @Schema(description = "修改时间")
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
     @Schema(description = "预设字段")
     @TableField(exist = false)

src/main/java/com/gxwebsoft/cms/entity/CmsWebsiteField.java

@@ -2,10 +2,9 @@ package com.gxwebsoft.cms.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.util.Date;
+import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import java.io.Serializable;
-import java.util.Date;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -66,6 +65,6 @@ public class CmsWebsiteField implements Serializable {
     private Integer tenantId;
 
     @Schema(description = "创建时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
 }

src/main/java/com/gxwebsoft/cms/entity/CmsWebsiteSetting.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import java.io.Serializable;
-import java.util.Date;
+import java.time.LocalDateTime;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -78,9 +78,9 @@ public class CmsWebsiteSetting implements Serializable {
     private Integer tenantId;
 
     @Schema(description = "创建时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
     @Schema(description = "修改时间")
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
 }

src/main/java/com/gxwebsoft/cms/param/CmsArticleImportParam.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
+import java.time.LocalDateTime;
 
 /**
  * 用户导入参数
@@ -55,7 +55,7 @@ public class CmsArticleImportParam implements Serializable {
     private String author;
 
     @Excel(name = "发布时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
     @Excel(name = "类型")
     private Integer type;

src/main/java/com/gxwebsoft/cms/service/impl/CmsWebsiteServiceImpl.java

@@ -1,9 +1,6 @@
 package com.gxwebsoft.cms.service.impl;
 
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gxwebsoft.cms.entity.*;
 import com.gxwebsoft.cms.mapper.*;
@@ -11,20 +8,16 @@ import com.gxwebsoft.cms.param.*;
 import com.gxwebsoft.cms.service.*;
 import com.gxwebsoft.common.core.web.PageParam;
 import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.system.entity.Company;
 import com.gxwebsoft.common.system.entity.User;
 import com.gxwebsoft.common.system.service.CompanyService;
 import com.gxwebsoft.common.system.service.UserService;
-import com.gxwebsoft.oa.service.OaCompanyService;
 import com.gxwebsoft.project.entity.Project;
 import com.gxwebsoft.project.service.ProjectService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.time.LocalDateTime;
 import java.util.List;
-import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
 
 /**
  * 网站信息记录表Service实现
@@ -79,10 +72,11 @@ public class CmsWebsiteServiceImpl extends ServiceImpl<CmsWebsiteMapper, CmsWebs
         page.setDefaultOrder("create_time desc");
         List<CmsWebsite> list = baseMapper.selectPageRel(page, param);
         list.forEach(d -> {
+          LocalDateTime now = LocalDateTime.now();
           // 即将过期(一周内过期的)
-          d.setSoon(DateUtil.offsetDay(d.getExpirationTime(), -30).compareTo(DateUtil.date()));
+          d.setSoon(d.getExpirationTime().minusDays(30).compareTo(now));
           // 是否过期 -1已过期 大于0 未过期
-          d.setStatus(d.getExpirationTime().compareTo(DateUtil.date()));
+          d.setStatus(d.getExpirationTime().compareTo(now));
         });
         return new PageResult<>(list, page.getTotal());
     }
@@ -109,10 +103,11 @@ public class CmsWebsiteServiceImpl extends ServiceImpl<CmsWebsiteMapper, CmsWebs
     page.setDefaultOrder("create_time desc");
     List<CmsWebsite> list = baseMapper.selectPageRelAll(page, param);
     list.forEach(d -> {
+      LocalDateTime now = LocalDateTime.now();
       // 即将过期(一周内过期的)
-      d.setSoon(DateUtil.offsetDay(d.getExpirationTime(), -30).compareTo(DateUtil.date()));
+      d.setSoon(d.getExpirationTime().minusDays(30).compareTo(now));
       // 是否过期 -1已过期 大于0 未过期
-      d.setStatus(d.getExpirationTime().compareTo(DateUtil.date()));
+      d.setStatus(d.getExpirationTime().compareTo(now));
     });
     return new PageResult<>(list, page.getTotal());
   }
@@ -130,7 +125,7 @@ public class CmsWebsiteServiceImpl extends ServiceImpl<CmsWebsiteMapper, CmsWebs
     website.setWebsiteType("云·企业官网");
     website.setAdminUrl("site.websoft.top");
     website.setVersion(10);
-    website.setExpirationTime(DateUtil.nextMonth());
+    website.setExpirationTime(LocalDateTime.now().plusMonths(1));
     website.setUserId(loginUser.getUserId());
     website.setDeveloper(loginUser.getNickname());
     website.setTenantId(loginUser.getTenantId());

src/main/java/com/gxwebsoft/common/core/service/CertificateService.java

@@ -13,6 +13,8 @@ import java.io.InputStream;
 import java.nio.file.Files;
 import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -143,8 +145,8 @@ public class CertificateService {
             CertificateInfo info = new CertificateInfo();
             info.setSubject(cert.getSubjectX500Principal().toString());
             info.setIssuer(cert.getIssuerX500Principal().toString());
-            info.setNotBefore(cert.getNotBefore());
+            info.setNotBefore(convertToLocalDateTime(cert.getNotBefore()));
-            info.setNotAfter(cert.getNotAfter());
+            info.setNotAfter(convertToLocalDateTime(cert.getNotAfter()));
             info.setSerialNumber(cert.getSerialNumber().toString());
             info.setValid(isValidDate(cert.getNotBefore(), cert.getNotAfter()));
 
@@ -236,14 +238,24 @@ public class CertificateService {
         return now.after(notBefore) && now.before(notAfter);
     }
 
+    /**
+     * 将Date转换为LocalDateTime
+     */
+    private LocalDateTime convertToLocalDateTime(Date date) {
+        if (date == null) {
+            return null;
+        }
+        return date.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
+    }
+
     /**
      * 证书信息类
      */
     public static class CertificateInfo {
         private String subject;
         private String issuer;
-        private Date notBefore;
+        private LocalDateTime notBefore;
-        private Date notAfter;
+        private LocalDateTime notAfter;
         private String serialNumber;
         private boolean valid;
 
@@ -254,11 +266,11 @@ public class CertificateService {
         public String getIssuer() { return issuer; }
         public void setIssuer(String issuer) { this.issuer = issuer; }
 
-        public Date getNotBefore() { return notBefore; }
+        public LocalDateTime getNotBefore() { return notBefore; }
-        public void setNotBefore(Date notBefore) { this.notBefore = notBefore; }
+        public void setNotBefore(LocalDateTime notBefore) { this.notBefore = notBefore; }
 
-        public Date getNotAfter() { return notAfter; }
+        public LocalDateTime getNotAfter() { return notAfter; }
-        public void setNotAfter(Date notAfter) { this.notAfter = notAfter; }
+        public void setNotAfter(LocalDateTime notAfter) { this.notAfter = notAfter; }
 
         public String getSerialNumber() { return serialNumber; }
         public void setSerialNumber(String serialNumber) { this.serialNumber = serialNumber; }

src/main/java/com/gxwebsoft/common/core/utils/CacheClient.java

@@ -13,7 +13,6 @@ import org.springframework.stereotype.Component;
 
 
 import java.time.LocalDateTime;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;

src/main/java/com/gxwebsoft/common/core/utils/RedisUtil.java

@@ -12,7 +12,6 @@ import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Component;
 
 import java.time.LocalDateTime;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

src/main/java/com/gxwebsoft/common/system/controller/CompanyController.java

@@ -262,10 +262,11 @@ public class CompanyController extends BaseController {
               company.setAuthentication(1);
             }
           }
+          LocalDateTime now = LocalDateTime.now();
           // 即将过期(一周内过期的)
-          company.setSoon(DateUtil.offsetDay(company.getExpirationTime(), -7).compareTo(DateUtil.date()));
+          company.setSoon(company.getExpirationTime().minusDays(7).compareTo(now));
           // 是否过期 -1已过期 大于0 未过期
-          company.setStatus(company.getExpirationTime().compareTo(DateUtil.date()));
+          company.setStatus(company.getExpirationTime().compareTo(now));
           return success(company);
         }
       }

src/main/java/com/gxwebsoft/common/system/entity/Company.java

@@ -9,7 +9,7 @@ import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.util.Date;
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -100,10 +100,10 @@ public class Company implements Serializable {
     private String invoiceHeader;
 
     @Schema(description = "服务开始时间")
-    private Date startTime;
+    private LocalDateTime startTime;
 
     @Schema(description = "服务到期时间")
-    private Date expirationTime;
+    private LocalDateTime expirationTime;
 
     @Schema(description = "即将过期")
     private Integer soon;
@@ -245,10 +245,10 @@ public class Company implements Serializable {
     private Integer deleted;
 
     @Schema(description = "创建时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
     @Schema(description = "修改时间")
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
     @Schema(description = "是否默认企业主体")
     private Boolean authoritative;

src/main/java/com/gxwebsoft/common/system/entity/CompanyComment.java

@@ -10,7 +10,7 @@ import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.util.Date;
+import java.time.LocalDateTime;
 
 /**
  * 应用评论
@@ -54,6 +54,6 @@ public class CompanyComment implements Serializable {
     private Integer tenantId;
 
     @Schema(description = "创建时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
 }

src/main/java/com/gxwebsoft/common/system/entity/CompanyContent.java

@@ -9,7 +9,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
-import java.util.Date;
+import java.time.LocalDateTime;
 
 /**
  * 应用详情
@@ -37,6 +37,6 @@ public class CompanyContent implements Serializable {
     private Integer tenantId;
 
     @Schema(description = "创建时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
 }

src/main/java/com/gxwebsoft/common/system/entity/CompanyGit.java

@@ -8,7 +8,7 @@ import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.util.Date;
+import java.time.LocalDateTime;
 
 /**
  * 代码仓库
@@ -58,7 +58,7 @@ public class CompanyGit implements Serializable {
     private Integer status;
 
     @Schema(description = "创建时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
     @Schema(description = "租户id")
     private Integer tenantId;
@@ -121,10 +121,10 @@ public class CompanyGit implements Serializable {
         private Integer tenantId;
 
         @Schema(description = "注册时间")
-        private Date createTime;
+        private LocalDateTime createTime;
 
         @Schema(description = "修改时间")
-        private Date updateTime;
+        private LocalDateTime updateTime;
 
         @Schema(description = "昵称")
         @TableField(exist = false)

src/main/java/com/gxwebsoft/common/system/entity/CompanyParameter.java

@@ -9,7 +9,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
-import java.util.Date;
+import java.time.LocalDateTime;
 
 /**
  * 应用参数
@@ -47,7 +47,7 @@ public class CompanyParameter implements Serializable {
     private Integer status;
 
     @Schema(description = "创建时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
     @Schema(description = "租户id")
     private Integer tenantId;

src/main/java/com/gxwebsoft/common/system/entity/CompanyUrl.java

@@ -9,7 +9,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
-import java.util.Date;
+import java.time.LocalDateTime;
 
 /**
  * 应用域名
@@ -56,7 +56,7 @@ public class CompanyUrl implements Serializable {
     private Integer status;
 
     @Schema(description = "创建时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
     @Schema(description = "租户id")
     private Integer tenantId;

src/main/java/com/gxwebsoft/common/system/entity/Dict.java

@@ -6,7 +6,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
+import java.time.LocalDateTime;
 import java.util.Set;
 
 /**
@@ -42,10 +42,10 @@ public class Dict implements Serializable {
     private Integer deleted;
 
     @Schema(description = "创建时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
     @Schema(description = "修改时间")
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
     @Schema(description = "租户id")
     private Integer tenantId;

src/main/java/com/gxwebsoft/common/system/entity/DictData.java

@@ -6,7 +6,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
+import java.time.LocalDateTime;
 
 /**
  * 字典数据
@@ -44,10 +44,10 @@ public class DictData implements Serializable {
     private Integer deleted;
 
     @Schema(description = "创建时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
     @Schema(description = "修改时间")
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
     @Schema(description = "字典代码")
     @TableField(exist = false)

src/main/java/com/gxwebsoft/common/system/entity/Dictionary.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 
-import java.util.Date;
+import java.time.LocalDateTime;
 import java.io.Serializable;
 
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -45,10 +45,10 @@ public class Dictionary implements Serializable {
     private Integer deleted;
 
     @Schema(description = "创建时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
     @Schema(description = "修改时间")
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
     @Schema(description = "租户id")
     private Integer tenantId;

src/main/java/com/gxwebsoft/common/system/entity/DictionaryData.java

@@ -2,7 +2,7 @@ package com.gxwebsoft.common.system.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 
-import java.util.Date;
+import java.time.LocalDateTime;
 import java.io.Serializable;
 
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -45,10 +45,10 @@ public class DictionaryData implements Serializable {
     private Integer deleted;
 
     @Schema(description = "创建时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
     @Schema(description = "修改时间")
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
     @Schema(description = "字典代码")
     @TableField(exist = false)

src/main/java/com/gxwebsoft/common/system/entity/EmailRecord.java

@@ -8,7 +8,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
+import java.time.LocalDateTime;
 
 /**
  * 邮件发送记录
@@ -48,9 +48,9 @@ public class EmailRecord implements Serializable {
     private Integer tenantId;
 
     @Schema(description = "创建时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
     @Schema(description = "修改时间")
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
 }

src/main/java/com/gxwebsoft/common/system/entity/FileRecord.java

@@ -6,7 +6,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
+import java.time.LocalDateTime;
 
 /**
  * 文件上传记录
@@ -59,10 +59,10 @@ public class FileRecord implements Serializable {
     private Integer tenantId;
 
     @Schema(description = "创建时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
     @Schema(description = "修改时间")
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
     @Schema(description = "文件访问地址")
     @TableField(exist = false)

src/main/java/com/gxwebsoft/common/system/entity/KVEntity.java

@@ -9,7 +9,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
+import java.time.LocalDateTime;
 
 /**
  * 租户

src/main/java/com/gxwebsoft/common/system/entity/LoginRecord.java

@@ -9,7 +9,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
+import java.time.LocalDateTime;
 
 /**
  * 登录日志
@@ -57,10 +57,10 @@ public class LoginRecord implements Serializable {
     private Integer tenantId;
 
     @Schema(description = "操作时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
     @Schema(description = "修改时间")
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
     @Schema(description = "用户id")
     @TableField(exist = false)

src/main/java/com/gxwebsoft/common/system/entity/Menu.java

@@ -6,7 +6,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.springframework.security.core.GrantedAuthority;
 
-import java.util.Date;
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -68,10 +68,10 @@ public class Menu implements GrantedAuthority {
     private Integer tenantId;
 
     @Schema(description = "创建时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
     @Schema(description = "修改时间")
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
     @Schema(description = "子菜单")
     @TableField(exist = false)

src/main/java/com/gxwebsoft/common/system/entity/OperationRecord.java

@@ -9,7 +9,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
+import java.time.LocalDateTime;
 
 /**
  * 操作日志
@@ -79,10 +79,10 @@ public class OperationRecord implements Serializable {
     private Integer tenantId;
 
     @Schema(description = "操作时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
     @Schema(description = "修改时间")
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
     @Schema(description = "用户昵称")
     @TableField(exist = false)

src/main/java/com/gxwebsoft/common/system/entity/Organization.java

@@ -2,7 +2,7 @@ package com.gxwebsoft.common.system.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 
-import java.util.Date;
+import java.time.LocalDateTime;
 import java.io.Serializable;
 
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -69,10 +69,10 @@ public class Organization implements Serializable {
     private Integer tenantId;
 
     @Schema(description = "创建时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
     @Schema(description = "修改时间")
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
     @Schema(description = "机构类型名称")
     @TableField(exist = false)

src/main/java/com/gxwebsoft/common/system/entity/Payment.java

@@ -10,7 +10,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
-import java.util.Date;
+import java.time.LocalDateTime;
 
 /**
  * 支付方式
@@ -88,9 +88,9 @@ public class Payment implements Serializable {
     private Integer tenantId;
 
     @Schema(description = "注册时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
     @Schema(description = "修改时间")
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
 }

src/main/java/com/gxwebsoft/common/system/entity/Plug.java

@@ -8,7 +8,7 @@ import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.util.Date;
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -110,10 +110,10 @@ public class Plug implements Serializable {
     private Integer tenantId;
 
     @Schema(description = "创建时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
     @Schema(description = "修改时间")
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
     @Schema(description = "子菜单")
     @TableField(exist = false)

src/main/java/com/gxwebsoft/common/system/entity/Role.java

@@ -6,7 +6,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
+import java.time.LocalDateTime;
 
 /**
  * 角色
@@ -41,10 +41,10 @@ public class Role implements Serializable {
     private Integer tenantId;
 
     @Schema(description = "创建时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
     @Schema(description = "修改时间")
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
     @Schema(hidden = true)
     @TableField(exist = false)

src/main/java/com/gxwebsoft/common/system/entity/RoleMenu.java

@@ -8,7 +8,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
+import java.time.LocalDateTime;
 
 /**
  * 角色菜单
@@ -36,9 +36,9 @@ public class RoleMenu implements Serializable {
     private Integer tenantId;
 
     @Schema(description = "创建时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
     @Schema(description = "修改时间")
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
 }

src/main/java/com/gxwebsoft/common/system/entity/Setting.java

@@ -7,7 +7,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
-import java.util.Date;
+import java.time.LocalDateTime;
 
 /**
  * 系统设置
@@ -46,10 +46,10 @@ public class Setting implements Serializable {
     private Integer tenantId;
 
     @Schema(description = "创建时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
     @Schema(description = "修改时间")
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
     @Schema(description = "修改租户名称")
     @TableField(exist = false)

src/main/java/com/gxwebsoft/common/system/entity/Tenant.java

@@ -7,7 +7,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
-import java.util.Date;
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -47,10 +47,10 @@ public class Tenant implements Serializable {
   private Integer deleted;
 
   @Schema(description = "创建时间")
-  private Date createTime;
+  private LocalDateTime createTime;
 
   @Schema(description = "修改时间")
-  private Date updateTime;
+  private LocalDateTime updateTime;
 
   @Schema(description = "logo")
   @TableField(exist = false)

src/main/java/com/gxwebsoft/common/system/entity/User.java

@@ -10,7 +10,7 @@ import lombok.Data;
 import org.springframework.security.core.userdetails.UserDetails;
 
 import java.math.BigDecimal;
-import java.util.Date;
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -82,8 +82,7 @@ public class User implements UserDetails {
     private String idCardNo;
 
     @Schema(description = "出生日期")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    private LocalDateTime birthday;
-    private Date birthday;
 
     @Schema(description = "年龄")
     private Integer age;
@@ -203,13 +202,13 @@ public class User implements UserDetails {
     private String tenantName;
 
     @Schema(description = "最后结算时间")
-    private Date settlementTime;
+    private LocalDateTime settlementTime;
 
     @Schema(description = "注册时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
     @Schema(description = "修改时间")
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
     @Schema(description = "公司名称")
     @TableField(exist = false)

src/main/java/com/gxwebsoft/common/system/entity/UserBalanceLog.java

@@ -8,7 +8,7 @@ import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.util.Date;
+import java.time.LocalDateTime;
 
 /**
  * 用户余额变动明细表
@@ -68,10 +68,10 @@ public class UserBalanceLog implements Serializable {
     private Integer tenantId;
 
     @Schema(description = "注册时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
     @Schema(description = "修改时间")
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
     @Schema(description = "昵称")
     @TableField(exist = false)

src/main/java/com/gxwebsoft/common/system/entity/UserCollection.java

@@ -9,7 +9,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
-import java.util.Date;
+import java.time.LocalDateTime;
 
 /**
  * 我的收藏
@@ -38,6 +38,6 @@ public class UserCollection implements Serializable {
     private Integer tenantId;
 
     @Schema(description = "注册时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
 }

src/main/java/com/gxwebsoft/common/system/entity/UserFile.java

@@ -3,7 +3,7 @@ package com.gxwebsoft.common.system.entity;
 import com.baomidou.mybatisplus.annotation.*;
 
 import java.io.Serializable;
-import java.util.Date;
+import java.time.LocalDateTime;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -56,10 +56,10 @@ public class UserFile implements Serializable {
     private Integer tenantId;
 
     @Schema(description = "创建时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
     @Schema(description = "修改时间")
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
     @Schema(description = "文件访问地址")
     @TableField(exist = false)

src/main/java/com/gxwebsoft/common/system/entity/UserInfo.java

@@ -7,7 +7,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.math.BigDecimal;
-import java.util.Date;
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -72,8 +72,7 @@ public class UserInfo {
     private String idCard;
 
     @Schema(description = "出生日期")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    private LocalDateTime birthday;
-    private Date birthday;
 
     @Schema(description = "年龄")
     private Integer age;
@@ -180,13 +179,13 @@ public class UserInfo {
     private String tenantName;
 
     @Schema(description = "最后结算时间")
-    private Date settlementTime;
+    private LocalDateTime settlementTime;
 
     @Schema(description = "注册时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
     @Schema(description = "修改时间")
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
     @Schema(description = "公司名称")
     private String companyName;

src/main/java/com/gxwebsoft/common/system/entity/UserReferee.java

@@ -7,7 +7,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
-import java.util.Date;
+import java.time.LocalDateTime;
 
 /**
  * 用户推荐关系表
@@ -46,10 +46,10 @@ public class UserReferee implements Serializable {
     private Integer tenantId;
 
     @Schema(description = "创建时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
     @Schema(description = "修改时间")
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
     @TableField(exist = false)
     private User user;

src/main/java/com/gxwebsoft/common/system/entity/UserRole.java

@@ -9,7 +9,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
+import java.time.LocalDateTime;
 
 /**
  * 用户角色
@@ -34,10 +34,10 @@ public class UserRole implements Serializable {
     private Integer roleId;
 
     @Schema(description = "创建时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
     @Schema(description = "修改时间")
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
     @Schema(description = "角色名称")
     @TableField(exist = false)

src/main/java/com/gxwebsoft/common/system/param/UserParam.java

@@ -12,7 +12,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
-import java.util.Date;
+import java.time.LocalDateTime;
 import java.util.Set;
 
 /**
@@ -210,7 +210,7 @@ public class UserParam extends BaseParam {
 
     @Schema(description = "最后结算时间")
     @TableField(exist = false)
-    private Date settlementTime;
+    private LocalDateTime settlementTime;
 
     @Schema(description = "报餐时间")
     @TableField(exist = false)

src/main/java/com/gxwebsoft/docs/entity/Docs.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import java.io.Serializable;
-import java.util.Date;
+import java.time.LocalDateTime;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -69,6 +69,6 @@ public class Docs implements Serializable {
     private Integer tenantId;
 
     @Schema(description = "创建时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
 }

src/main/java/com/gxwebsoft/docs/entity/DocsContent.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 
 import java.io.Serializable;
-import java.util.Date;
+import java.time.LocalDateTime;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -46,9 +46,9 @@ public class DocsContent implements Serializable {
     private Integer tenantId;
 
     @Schema(description = "创建时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
     @Schema(description = "修改时间")
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
 }

src/main/java/com/gxwebsoft/docs/entity/DocsUser.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 
 import java.io.Serializable;
-import java.util.Date;
+import java.time.LocalDateTime;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -49,6 +49,6 @@ public class DocsUser implements Serializable {
     private Integer tenantId;
 
     @Schema(description = "创建时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
 }

src/main/java/com/gxwebsoft/hjm/controller/HjmViolationController.java

@@ -19,7 +19,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.util.Date;
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**

src/main/java/com/gxwebsoft/hjm/controller/WxNotificationTestController.java

@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
-import java.util.Date;
+import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
 

src/main/java/com/gxwebsoft/hjm/entity/Gps.java

@@ -10,7 +10,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
-import java.util.Date;
+import java.time.LocalDateTime;
 
 /**
  * GPS

src/main/java/com/gxwebsoft/hjm/entity/HjmBxLog.java

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import java.io.Serializable;
-import java.util.Date;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -74,9 +73,9 @@ public class HjmBxLog implements Serializable {
     private Integer tenantId;
 
     @Schema(description = "创建时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
     @Schema(description = "修改时间")
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
 }

src/main/java/com/gxwebsoft/hjm/entity/HjmCar.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import java.io.Serializable;
-import java.util.Date;
+import java.time.LocalDateTime;
 import java.util.List;
 
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -162,9 +162,9 @@ public class HjmCar implements Serializable {
     private Integer tenantId;
 
     @Schema(description = "创建时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
     @Schema(description = "修改时间")
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
 }

src/main/java/com/gxwebsoft/hjm/entity/HjmChoices.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import java.io.Serializable;
-import java.util.Date;
+import java.time.LocalDateTime;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -53,9 +53,9 @@ public class HjmChoices implements Serializable {
     private Integer tenantId;
 
     @Schema(description = "创建时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
     @Schema(description = "修改时间")
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
 }

src/main/java/com/gxwebsoft/hjm/entity/HjmCourses.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import java.io.Serializable;
-import java.util.Date;
+import java.time.LocalDateTime;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -60,9 +60,9 @@ public class HjmCourses implements Serializable {
     private Integer tenantId;
 
     @Schema(description = "创建时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
     @Schema(description = "修改时间")
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
 }

src/main/java/com/gxwebsoft/hjm/entity/HjmExamLog.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import java.io.Serializable;
-import java.util.Date;
+import java.time.LocalDateTime;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -67,9 +67,9 @@ public class HjmExamLog implements Serializable {
     private Integer tenantId;
 
     @Schema(description = "创建时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
     @Schema(description = "修改时间")
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
 }

src/main/java/com/gxwebsoft/hjm/entity/HjmFence.java

@@ -3,7 +3,7 @@ package com.gxwebsoft.hjm.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
-import java.util.Date;
+import java.time.LocalDateTime;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -60,9 +60,9 @@ public class HjmFence implements Serializable {
     private Integer tenantId;
 
     @Schema(description = "创建时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
     @Schema(description = "修改时间")
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
 }

src/main/java/com/gxwebsoft/hjm/entity/HjmGpsLog.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
-import java.util.Date;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -59,7 +58,7 @@ public class HjmGpsLog implements Serializable {
     private Integer tenantId;
 
     @Schema(description = "创建时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
     @Schema(description = "操作员电话")
     @TableField(exist = false)

src/main/java/com/gxwebsoft/hjm/entity/HjmQuestions.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import java.io.Serializable;
-import java.util.Date;
+import java.time.LocalDateTime;
 import java.util.List;
 
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -67,10 +67,10 @@ public class HjmQuestions implements Serializable {
     private Integer tenantId;
 
     @Schema(description = "创建时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
     @Schema(description = "修改时间")
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
     @Schema(description = "正确答案")
     @TableField(exist = false)

src/main/java/com/gxwebsoft/hjm/entity/HjmViolation.java

@@ -4,7 +4,7 @@ import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
-import java.util.Date;
+import java.time.LocalDateTime;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -61,9 +61,9 @@ public class HjmViolation implements Serializable {
     private Integer tenantId;
 
     @Schema(description = "创建时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
     @Schema(description = "修改时间")
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
 }

src/main/java/com/gxwebsoft/hjm/service/impl/HjmViolationServiceImpl.java

@@ -17,7 +17,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
-import java.util.Date;
+import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.List;
 

src/main/java/com/gxwebsoft/house/controller/HouseTestDataController.java

@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
-import java.util.Date;
+import java.time.LocalDateTime;
 
 /**
  * 房源测试数据控制器

src/main/java/com/gxwebsoft/house/entity/HouseFiles.java

@@ -9,7 +9,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
-import java.util.Date;
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**

src/main/java/com/gxwebsoft/house/entity/HouseInfo.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import java.io.Serializable;
-import java.util.Date;
+import java.time.LocalDateTime;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -96,7 +96,7 @@ public class HouseInfo implements Serializable {
     private String content;
 
     @Schema(description = "到期时间")
-    private Date expirationTime;
+    private LocalDateTime expirationTime;
 
     @Schema(description = "所在省份")
     private String province;
@@ -154,10 +154,10 @@ public class HouseInfo implements Serializable {
     private Integer tenantId;
 
     @Schema(description = "创建时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
     @Schema(description = "修改时间")
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
     @Schema(description = "昵称")
     @TableField(exist = false)

src/main/java/com/gxwebsoft/house/entity/HouseLikeLog.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import java.io.Serializable;
-import java.util.Date;
+import java.time.LocalDateTime;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -41,10 +41,10 @@ public class HouseLikeLog implements Serializable {
     private Integer tenantId;
 
     @Schema(description = "注册时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
     @Schema(description = "更新时间")
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
     @Schema(description = "删除")
     @TableLogic

src/main/java/com/gxwebsoft/house/entity/HouseReservation.java

@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import java.io.Serializable;
-import java.util.Date;
+import java.time.LocalDateTime;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -52,13 +52,13 @@ public class HouseReservation implements Serializable {
     private String phone;
 
     @Schema(description = "付款时间")
-    private Date payTime;
+    private LocalDateTime payTime;
 
     @Schema(description = "付款状态(10未付款 20已付款)")
     private Integer payStatus;
 
     @Schema(description = "到期时间")
-    private Date expirationTime;
+    private LocalDateTime expirationTime;
 
     @Schema(description = "所在省份")
     private String province;
@@ -95,10 +95,10 @@ public class HouseReservation implements Serializable {
     private Integer tenantId;
 
     @Schema(description = "注册时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
     @Schema(description = "修改时间")
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
     @Schema(description = "昵称")
     @TableField(exist = false)

src/main/java/com/gxwebsoft/house/entity/HouseUser.java

@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import java.io.Serializable;
-import java.util.Date;
+import java.time.LocalDateTime;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -191,12 +191,12 @@ public class HouseUser implements Serializable {
     private Integer tenantId;
 
     @Schema(description = "最后结算时间")
-    private Date settlementTime;
+    private LocalDateTime settlementTime;
 
     @Schema(description = "注册时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
     @Schema(description = "修改时间")
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
 }

src/main/java/com/gxwebsoft/house/entity/HouseViewsLog.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import java.io.Serializable;
-import java.util.Date;
+import java.time.LocalDateTime;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -41,10 +41,10 @@ public class HouseViewsLog implements Serializable {
     private Integer tenantId;
 
     @Schema(description = "注册时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
     @Schema(description = "更新时间")
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
     @Schema(description = "删除")
     @TableLogic

src/main/java/com/gxwebsoft/oa/controller/OaAssetsSslController.java

@@ -16,7 +16,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.util.Date;
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**

src/main/java/com/gxwebsoft/oa/entity/OaApp.java

@@ -4,10 +4,9 @@ import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.util.Date;
+import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import java.io.Serializable;
-import java.util.Date;
 import java.util.List;
 
 import com.gxwebsoft.common.system.entity.FileRecord;
@@ -195,7 +194,7 @@ public class OaApp implements Serializable {
     private Integer recommend;
 
     @Schema(description = "到期时间")
-    private Date expirationTime;
+    private LocalDateTime expirationTime;
 
     @Schema(description = "续费金额")
     private BigDecimal renewMoney;
@@ -226,10 +225,10 @@ public class OaApp implements Serializable {
     private Integer tenantId;
 
     @Schema(description = "创建时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
     @Schema(description = "修改时间")
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
     @Schema(description = "成员管理")
     @TableField(exist = false)

src/main/java/com/gxwebsoft/oa/entity/OaAppField.java

@@ -2,7 +2,7 @@ package com.gxwebsoft.oa.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.util.Date;
+import java.time.LocalDateTime;
 import java.io.Serializable;
 
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -48,6 +48,6 @@ public class OaAppField implements Serializable {
     private Integer tenantId;
 
     @Schema(description = "创建时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
 }

src/main/java/com/gxwebsoft/oa/entity/OaAppRenew.java

@@ -3,7 +3,7 @@ package com.gxwebsoft.oa.entity;
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.util.Date;
+import java.time.LocalDateTime;
 import java.io.Serializable;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -36,10 +36,10 @@ public class OaAppRenew implements Serializable {
     private String comments;
 
     @Schema(description = "开始时间")
-    private Date startTime;
+    private LocalDateTime startTime;
 
     @Schema(description = "到期时间")
-    private Date endTime;
+    private LocalDateTime endTime;
 
     @Schema(description = "企业ID")
     private Integer companyId;
@@ -60,6 +60,6 @@ public class OaAppRenew implements Serializable {
     private Integer tenantId;
 
     @Schema(description = "创建时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
 }

src/main/java/com/gxwebsoft/oa/entity/OaAppUrl.java

@@ -2,7 +2,7 @@ package com.gxwebsoft.oa.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.util.Date;
+import java.time.LocalDateTime;
 import java.io.Serializable;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -50,7 +50,7 @@ public class OaAppUrl implements Serializable {
     private Integer status;
 
     @Schema(description = "创建时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
     @Schema(description = "租户id")
     private Integer tenantId;

src/main/java/com/gxwebsoft/oa/entity/OaAppUser.java

@@ -2,7 +2,7 @@ package com.gxwebsoft.oa.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.util.Date;
+import java.time.LocalDateTime;
 import java.io.Serializable;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -44,6 +44,6 @@ public class OaAppUser implements Serializable {
     private Integer tenantId;
 
     @Schema(description = "创建时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
 }

src/main/java/com/gxwebsoft/oa/entity/OaAssets.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import java.io.Serializable;
-import java.util.Date;
+import java.time.LocalDateTime;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -97,10 +97,10 @@ public class OaAssets implements Serializable {
     private String content;
 
     @Schema(description = "购买时间")
-    private Date startTime;
+    private LocalDateTime startTime;
 
     @Schema(description = "到期时间")
-    private Date endTime;
+    private LocalDateTime endTime;
 
     @Schema(description = "置顶状态")
     private String isTop;
@@ -148,9 +148,9 @@ public class OaAssets implements Serializable {
     private String logo;
 
     @Schema(description = "创建时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
     @Schema(description = "修改时间")
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
 }