Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-api-cloud

pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/entity/UserTrustedDeviceEntity.java

@@ -0,0 +1,95 @@
+package com.bsd.pjcloud.admin.api.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.time.LocalDateTime;
+
+/**
+ * 设备指纹
+ *
+ * @author zjf
+ * @date 2025-04-22 17:14:57
+ */
+@Data
+@TableName("user_trusted_device")
+@EqualsAndHashCode(callSuper = true)
+@Schema(description = "设备指纹")
+public class UserTrustedDeviceEntity extends Model<UserTrustedDeviceEntity> {
+
+
+	/**
+	* 主键ID
+	*/
+    @TableId(type = IdType.ASSIGN_ID)
+    @Schema(description="主键ID")
+    private Long id;
+
+	/**
+	* 用户id
+	*/
+    @Schema(description="用户id")
+    private Long userId;
+
+	/**
+	* MD5
+	*/
+    @Schema(description="MD5")
+    private String deviceFingerprint;
+
+	/**
+	* 设备名称
+	*/
+    @Schema(description="设备名称")
+    private String deviceName;
+
+	/**
+	* 最后一次登录时间
+	*/
+    @Schema(description="最后一次登录时间")
+    private LocalDateTime lastLoginTime;
+
+	/**
+	* 过期时间
+	*/
+    @Schema(description="过期时间")
+    private LocalDateTime expireTime;
+
+	/**
+	* 创建人
+	*/
+	@TableField(fill = FieldFill.INSERT)
+    @Schema(description="创建人")
+    private String createBy;
+
+	/**
+	* 创建时间
+	*/
+	@TableField(fill = FieldFill.INSERT)
+    @Schema(description="创建时间")
+    private LocalDateTime createTime;
+
+	/**
+	* 更新时间
+	*/
+	@TableField(fill = FieldFill.INSERT_UPDATE)
+    @Schema(description="更新时间")
+    private String updateBy;
+
+	/**
+	* 更新时间
+	*/
+	@TableField(fill = FieldFill.INSERT_UPDATE)
+    @Schema(description="更新时间")
+    private LocalDateTime updateTime;
+
+	/**
+	* 删除标记
+	*/
+    @TableLogic
+	@TableField(fill = FieldFill.INSERT)
+    @Schema(description="删除标记")
+    private String delFlag;
+}

pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/vo/SimpleUserListVO.java

@@ -0,0 +1,15 @@
+package com.bsd.pjcloud.admin.api.vo;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+@Schema(description = "简要用户信息,不包含手机号")
+public class SimpleUserListVO {
+
+    private Long userId;
+
+    @Schema(description = "姓名")
+    private String name;
+}