From b864ea85f84cee2df8616f4eb5757f5f3f1a5c43 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Mon, 19 Jan 2026 15:05:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.11rg' into 1.11rg

---
 src/main/java/com/nq/pojo/SiteAdmin.java |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/nq/pojo/SiteAdmin.java b/src/main/java/com/nq/pojo/SiteAdmin.java
index ce79826..fea278a 100644
--- a/src/main/java/com/nq/pojo/SiteAdmin.java
+++ b/src/main/java/com/nq/pojo/SiteAdmin.java
@@ -1,9 +1,13 @@
 package com.nq.pojo;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 import java.util.Date;
 @Data
 public class SiteAdmin {
+    @TableId(value = "id",type = IdType.AUTO)
     private Integer id;
     private String adminName;
     private String adminPwd;
@@ -12,6 +16,14 @@
     private Date addTime;
     private String token;
 
-
+    /**
+     * 谷歌验证器
+     */
+    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
+    private String googleAuthSecret;
+    /**
+     * 谷歌验证器是否绑定
+     */
+    private Boolean googleAuthBind=false;
 }
 

--
Gitblit v1.9.3