From aa3e8c99869c7751b809d0d380ba4a83d702d92f Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期日, 31 三月 2024 22:19:55 +0800
Subject: [PATCH] update 优化 调整sql不一致问题
---
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysSocialVo.java | 41 ++++++++++-------------------------------
1 files changed, 10 insertions(+), 31 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysSocialVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysSocialVo.java
index a8463b8..948dbcc 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysSocialVo.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysSocialVo.java
@@ -1,13 +1,12 @@
package org.dromara.system.domain.vo;
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.alibaba.excel.annotation.ExcelProperty;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import org.dromara.system.domain.SysSocial;
import java.io.Serial;
import java.io.Serializable;
+import java.util.Date;
/**
@@ -16,7 +15,6 @@
* @author thiszhc
*/
@Data
-@ExcelIgnoreUnannotated
@AutoMapper(target = SysSocial.class)
public class SysSocialVo implements Serializable {
@@ -26,8 +24,12 @@
/**
* 涓婚敭
*/
- @ExcelProperty(value = "涓婚敭")
private Long id;
+
+ /**
+ * 鐢ㄦ埛ID
+ */
+ private Long userId;
/**
* 绉熸埛ID
@@ -37,129 +39,106 @@
/**
* 鐨勫敮涓�ID
*/
- @ExcelProperty(value = "鎺堟潈UUID")
private String authId;
/**
* 鐢ㄦ埛鏉ユ簮
*/
- @ExcelProperty(value = "鐢ㄦ埛鏉ユ簮")
private String source;
/**
* 鐢ㄦ埛鐨勬巿鏉冧护鐗�
*/
- @ExcelProperty(value = "鐢ㄦ埛鐨勬巿鏉冧护鐗�")
private String accessToken;
/**
* 鐢ㄦ埛鐨勬巿鏉冧护鐗岀殑鏈夋晥鏈燂紝閮ㄥ垎骞冲彴鍙兘娌℃湁
*/
- @ExcelProperty(value = "鐢ㄦ埛鐨勬巿鏉冧护鐗岀殑鏈夋晥鏈燂紝閮ㄥ垎骞冲彴鍙兘娌℃湁")
private int expireIn;
/**
* 鍒锋柊浠ょ墝锛岄儴鍒嗗钩鍙板彲鑳芥病鏈�
*/
- @ExcelProperty(value = "鍒锋柊浠ょ墝锛岄儴鍒嗗钩鍙板彲鑳芥病鏈�")
private String refreshToken;
/**
* 鐢ㄦ埛鐨� open id
*/
- @ExcelProperty(value = "鐢ㄦ埛鐨� open id")
private String openId;
-
- /**
- * 鐢ㄦ埛鐨� ID
- */
- @ExcelProperty(value = "鐢ㄦ埛鐨� ID")
- private Long userId;
/**
* 鎺堟潈鐨勭涓夋柟璐﹀彿
*/
- @ExcelProperty(value = "鎺堟潈鐨勭涓夋柟璐﹀彿")
private String userName;
/**
* 鎺堟潈鐨勭涓夋柟鏄电О
*/
- @ExcelProperty(value = "鎺堟潈鐨勭涓夋柟鏄电О")
private String nickName;
/**
* 鎺堟潈鐨勭涓夋柟閭
*/
- @ExcelProperty(value = "鎺堟潈鐨勭涓夋柟閭")
private String email;
/**
* 鎺堟潈鐨勭涓夋柟澶村儚鍦板潃
*/
- @ExcelProperty(value = "鎺堟潈鐨勭涓夋柟澶村儚鍦板潃")
private String avatar;
/**
* 骞冲彴鐨勬巿鏉冧俊鎭紝閮ㄥ垎骞冲彴鍙兘娌℃湁
*/
- @ExcelProperty(value = "骞冲彴鐨勬巿鏉冧俊鎭紝閮ㄥ垎骞冲彴鍙兘娌℃湁")
private String accessCode;
/**
* 鐢ㄦ埛鐨� unionid
*/
- @ExcelProperty(value = "鐢ㄦ埛鐨� unionid")
private String unionId;
/**
* 鎺堜簣鐨勬潈闄愶紝閮ㄥ垎骞冲彴鍙兘娌℃湁
*/
- @ExcelProperty(value = "鎺堜簣鐨勬潈闄愶紝閮ㄥ垎骞冲彴鍙兘娌℃湁")
private String scope;
/**
* 涓埆骞冲彴鐨勬巿鏉冧俊鎭紝閮ㄥ垎骞冲彴鍙兘娌℃湁
*/
- @ExcelProperty(value = "涓埆骞冲彴鐨勬巿鏉冧俊鎭紝閮ㄥ垎骞冲彴鍙兘娌℃湁")
private String tokenType;
/**
* id token锛岄儴鍒嗗钩鍙板彲鑳芥病鏈�
*/
- @ExcelProperty(value = "id token锛岄儴鍒嗗钩鍙板彲鑳芥病鏈�")
private String idToken;
/**
* 灏忕背骞冲彴鐢ㄦ埛鐨勯檮甯﹀睘鎬э紝閮ㄥ垎骞冲彴鍙兘娌℃湁
*/
- @ExcelProperty(value = "灏忕背骞冲彴鐢ㄦ埛鐨勯檮甯﹀睘鎬э紝閮ㄥ垎骞冲彴鍙兘娌℃湁")
private String macAlgorithm;
/**
* 灏忕背骞冲彴鐢ㄦ埛鐨勯檮甯﹀睘鎬э紝閮ㄥ垎骞冲彴鍙兘娌℃湁
*/
- @ExcelProperty(value = "灏忕背骞冲彴鐢ㄦ埛鐨勯檮甯﹀睘鎬э紝閮ㄥ垎骞冲彴鍙兘娌℃湁")
private String macKey;
/**
* 鐢ㄦ埛鐨勬巿鏉僣ode锛岄儴鍒嗗钩鍙板彲鑳芥病鏈�
*/
- @ExcelProperty(value = "鐢ㄦ埛鐨勬巿鏉僣ode锛岄儴鍒嗗钩鍙板彲鑳芥病鏈�")
private String code;
/**
* Twitter骞冲彴鐢ㄦ埛鐨勯檮甯﹀睘鎬э紝閮ㄥ垎骞冲彴鍙兘娌℃湁
*/
- @ExcelProperty(value = "Twitter骞冲彴鐢ㄦ埛鐨勯檮甯﹀睘鎬э紝閮ㄥ垎骞冲彴鍙兘娌℃湁")
private String oauthToken;
/**
* Twitter骞冲彴鐢ㄦ埛鐨勯檮甯﹀睘鎬э紝閮ㄥ垎骞冲彴鍙兘娌℃湁
*/
- @ExcelProperty(value = "Twitter骞冲彴鐢ㄦ埛鐨勯檮甯﹀睘鎬э紝閮ㄥ垎骞冲彴鍙兘娌℃湁")
private String oauthTokenSecret;
-
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ private Date createTime;
}
--
Gitblit v1.9.3