合并

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

@@ -33,9 +33,14 @@ public class SysUser extends BaseEntity
     @Excel(name = "登录名称")
     private String userName;
 
+
+
     /** 用户昵称 */
     @Excel(name = "用户名称")
     private String nickName;
+    /** 用户身份证号 */
+    @Excel(name = "身份证号")
+    private String idCard;
 
     /** 用户邮箱 */
     @Excel(name = "用户邮箱")
@@ -297,12 +302,21 @@ public class SysUser extends BaseEntity
         this.roleId = roleId;
     }
 
+    public String getIdCard() {
+        return idCard;
+    }
+
+    public void setIdCard(String idCard) {
+        this.idCard = idCard;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("userId", getUserId())
             .append("deptId", getDeptId())
             .append("userName", getUserName())
+            .append("idCard", getIdCard())
             .append("nickName", getNickName())
             .append("email", getEmail())
             .append("phonenumber", getPhonenumber())

ruoyi-common/src/main/java/com/ruoyi/common/utils/WxAppletNotifyUtils.java

@@ -2,22 +2,14 @@ package com.ruoyi.common.utils;
 
 /**
  * @author wangqiong
- * @description
+ * @description 获取微信小程序url scheme
  * @date 2023-10-13 10:16
  */
-import cn.hutool.core.util.StrUtil;
+
 import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Component;
 
-
-/**
- * @Author: Tenk
- */
-@RequiredArgsConstructor
-@Component
 public class WxAppletNotifyUtils {
 
     /**