From 4b8b3485ab76dc93a82726de4ad6cda86078d45c Mon Sep 17 00:00:00 2001
From: pppscn <35696959@qq.com>
Date: Thu, 28 Oct 2021 14:43:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E2=80=9C=E8=BD=AC=E5=8F=91?=
 =?UTF-8?q?=E6=97=B6=E9=99=84=E5=8A=A0=E5=8D=A1=E6=A7=BD=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E2=80=9D=E5=92=8C=E2=80=9C=E8=BD=AC=E5=8F=91=E6=97=B6=E9=99=84?=
 =?UTF-8?q?=E5=8A=A0=E8=AE=BE=E5=A4=87=E5=90=8D=E7=A7=B0=E2=80=9D=E5=BC=80?=
 =?UTF-8?q?=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/idormy/sms/forwarder/model/vo/SmsVo.java     | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/app/src/main/java/com/idormy/sms/forwarder/model/vo/SmsVo.java b/app/src/main/java/com/idormy/sms/forwarder/model/vo/SmsVo.java
index 73d4a241..7e6daebc 100644
--- a/app/src/main/java/com/idormy/sms/forwarder/model/vo/SmsVo.java
+++ b/app/src/main/java/com/idormy/sms/forwarder/model/vo/SmsVo.java
@@ -40,14 +40,6 @@ public class SmsVo implements Serializable {
             smsTemplate = "{{来源号码}}\n{{短信内容}}\n{{卡槽信息}}\n{{接收时间}}\n{{设备名称}}";
         }
 
-        if (!switchAddExtra) {
-            smsTemplate = smsTemplate.replace("{{卡槽信息}}\n", "").replace("{{卡槽信息}}", "");
-        }
-
-        if (!switchAddDeviceName) {
-            smsTemplate = smsTemplate.replace("\n{{设备名称}}", "").replace("{{设备名称}}", "");
-        }
-
         return smsTemplate.replace("{{来源号码}}", mobile)
                 .replace("{{短信内容}}", content)
                 .replace("{{卡槽信息}}", simInfo)