From 3013bf3c0d1af32c83c8d2ba672dce367bb578ed Mon Sep 17 00:00:00 2001
From: Vinjor <vinjorm@gmail.com>
Date: Mon, 25 Aug 2025 16:00:03 +0800
Subject: [PATCH] 1

---
 .../java/com/ruoyi/base/domain/BaseSiteInfo.java  |  4 ++++
 .../resources/mapper/base/BaseSiteInfoMapper.xml  |  3 ++-
 dl_vue/src/views/base/info/index.vue              | 15 ++++++++++++---
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/domain/BaseSiteInfo.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/domain/BaseSiteInfo.java
index 333c883..1ca2cef 100644
--- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/domain/BaseSiteInfo.java
+++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/domain/BaseSiteInfo.java
@@ -51,6 +51,10 @@ public class BaseSiteInfo extends DlBaseEntity
     @Excel(name = "手机号码(发询盘短信要用到,格式:+8618612345678 或者 +886970123456)")
     @ApiModelProperty("手机号码")
     private String tel;
+    /** whatsapp号码（询盘用） */
+    @Excel(name = "whatsapp号码（询盘用）")
+    @ApiModelProperty("whatsapp号码（询盘用）")
+    private String whatsapp;
 
     /** Email（询盘用） */
     @Excel(name = "Email", readConverterExp = "询=盘用")
diff --git a/dl_admin/ruoyi-admin/src/main/resources/mapper/base/BaseSiteInfoMapper.xml b/dl_admin/ruoyi-admin/src/main/resources/mapper/base/BaseSiteInfoMapper.xml
index 87db19f..a7dfada 100644
--- a/dl_admin/ruoyi-admin/src/main/resources/mapper/base/BaseSiteInfoMapper.xml
+++ b/dl_admin/ruoyi-admin/src/main/resources/mapper/base/BaseSiteInfoMapper.xml
@@ -10,6 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="faxNumber"    column="fax_number"    />
         <result property="brandName"    column="brand_name"    />
         <result property="tel"    column="tel"    />
+        <result property="whatsapp"    column="whatsapp"    />
         <result property="email"    column="email"    />
         <result property="teams"    column="teams"    />
         <result property="copyright"    column="copyright"    />
@@ -31,7 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectBaseSiteInfoVo">
-        select id, company_name, fax_number, brand_name, tel, email, teams, copyright, address, icon, logo,mobile_logo,form_logo, qr_code, contact_us,company_info,company_info_app, tenant_id, creator, create_time, updater, update_time, del_flag from dl_base_site_info
+        select id, company_name, fax_number, brand_name, tel,whatsapp, email, teams, copyright, address, icon, logo,mobile_logo,form_logo, qr_code, contact_us,company_info,company_info_app, tenant_id, creator, create_time, updater, update_time, del_flag from dl_base_site_info
     </sql>
 
     <select id="queryListPage" parameterType="BaseSiteInfo" resultMap="BaseSiteInfoResult">
diff --git a/dl_vue/src/views/base/info/index.vue b/dl_vue/src/views/base/info/index.vue
index 58ddfe0..4021b1d 100644
--- a/dl_vue/src/views/base/info/index.vue
+++ b/dl_vue/src/views/base/info/index.vue
@@ -27,7 +27,7 @@
       </el-row>
       <h1>询盘联系方式</h1>
       <el-row>
-        <el-col :span="8">
+        <el-col :span="6">
           <el-form-item label="手机号码" prop="tel">
             <div class="dl-flex-column">
               <el-input v-model="form.tel" placeholder="请输入手机号码"/>
@@ -39,7 +39,7 @@
             </div>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
+        <el-col :span="6">
           <el-form-item label="Email" prop="email">
             <div class="dl-flex-column">
               <el-input v-model="form.email" placeholder="请输入Email"/>
@@ -51,11 +51,16 @@
             </div>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
+        <el-col :span="6">
           <el-form-item label="Teams账号" prop="teams">
             <el-input v-model="form.teams" placeholder="请输入Teams账号"/>
           </el-form-item>
         </el-col>
+        <el-col :span="6">
+          <el-form-item label="WhatsApp" prop="whatsapp">
+            <el-input v-model="form.whatsapp" placeholder="请输入WhatsApp账号"/>
+          </el-form-item>
+        </el-col>
       </el-row>
       <h1>站点信息</h1>
       <el-row>
@@ -139,6 +144,7 @@ export default {
         faxNumber: null,
         brandName: null,
         tel: null,
+        whatsapp: null,
         email: null,
         teams: null,
         copyright: null,
@@ -166,6 +172,9 @@ export default {
         tel: [
           { required: true, message: '请输入手机号码', trigger: 'blur' }
         ],
+        whatsapp: [
+          { required: true, message: '请输入whatsapp号码', trigger: 'blur' }
+        ],
         email: [
           { required: true, message: '请输入Email账号', trigger: 'blur' },
           { type: 'email', message: '请输入正确的邮箱地址', trigger: 'blur' }