chore: 合并 master 分支

src/main/java/com/youlai/boot/system/model/bo/UserBO.java

@@ -1,9 +1,8 @@
 package com.youlai.boot.system.model.bo;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
-import java.util.Date;
+import java.time.LocalDateTime;
 
 /**
  * 用户持久化对象
@@ -67,6 +66,5 @@ public class UserBO {
     /**
      * 创建时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date createTime;
+    private LocalDateTime createTime;
 }

src/main/java/com/youlai/boot/system/model/entity/Log.java

@@ -2,7 +2,6 @@ package com.youlai.boot.system.model.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.youlai.boot.common.enums.LogModuleEnum;
-import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.io.Serializable;

src/main/java/com/youlai/boot/system/model/form/DictForm.java

@@ -28,6 +28,9 @@ public class DictForm {
     @Schema(description = "字典编码", example ="gender")
     private String dictCode;
 
+    @Schema(description = "备注")
+    private String remark;
+
     @Schema(description = "字典状态（1-启用，0-禁用）", example = "1")
     @Range(min = 0, max = 1, message = "字典状态不正确")
     private Integer status;

src/main/java/com/youlai/boot/system/model/form/EmailUpdateForm.java

@@ -1,6 +1,7 @@
 package com.youlai.boot.system.model.form;
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 
 /**
@@ -14,9 +15,11 @@ import lombok.Data;
 public class EmailUpdateForm {
 
     @Schema(description = "邮箱")
+    @NotBlank(message = "邮箱不能为空")
     private String email;
 
     @Schema(description = "验证码")
+    @NotBlank(message = "验证码不能为空")
     private String code;
 
 }

src/main/java/com/youlai/boot/system/model/form/MobileUpdateForm.java

@@ -1,6 +1,7 @@
 package com.youlai.boot.system.model.form;
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 
 /**
@@ -14,9 +15,11 @@ import lombok.Data;
 public class MobileUpdateForm {
 
     @Schema(description = "手机号码")
+    @NotBlank(message = "手机号码不能为空")
     private String mobile;
 
     @Schema(description = "验证码")
+    @NotBlank(message = "验证码不能为空")
     private String code;
 
 }

src/main/java/com/youlai/boot/system/model/form/PasswordResetForm.java

@@ -1,23 +0,0 @@
-package com.youlai.boot.system.model.form;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-/**
- * 重置密码表单
- *
- * @author Ray
- * @since 2024/8/13
- */
-@Schema(description = "重置密码表单")
-@Data
-public class PasswordResetForm {
-
-    @Schema(description = "用户ID")
-    private Long userId;
-
-    @Schema(description = "密码")
-    private String password;
-
-
-}

src/main/java/com/youlai/boot/system/model/vo/UserPageVO.java

@@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-import java.util.Date;
+import java.time.LocalDateTime;
 
 /**
  * 用户分页视图对象
@@ -48,6 +48,6 @@ public class UserPageVO {
 
     @Schema(description="创建时间")
     @JsonFormat(pattern = "yyyy/MM/dd HH:mm")
-    private Date createTime;
+    private LocalDateTime createTime;
 
 }

src/main/java/com/youlai/boot/system/model/vo/VisitTrendVO.java

@@ -10,7 +10,7 @@ import java.util.List;
 /**
  * 访问趋势VO
  *
- * @author Ray
+ * @author Ray.Hao
  * @since 2.3.0
  */
 @Schema(description = "访问趋势VO")
@@ -24,9 +24,6 @@ public class VisitTrendVO {
     @Schema(description = "浏览量(PV)")
     private List<Integer> pvList;
 
-    @Schema(description = "访客数(UV)")
-    private List<Integer> uvList;
-
     @Schema(description = "IP数")
     private List<Integer> ipList;