From 3ec7de773bff5582411c6f1f659d35cf8fb1734a Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 16 七月 2024 15:13:51 +0800
Subject: [PATCH] Merge branch 'feature/v1.4.1'

---
 app/src/main/res/values/strings.xml |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7a03be6..b7b0e86 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -15,7 +15,7 @@
     <string name="home_login_chinese">绠�浣撲腑鏂�</string>
     <string name="home_login_hdl_stored_energy">HDL鍏変紡鍌ㄨ兘</string>
     <string name="home_login_an_installer">鎴戞槸瀹夎鍟�</string>
-    <string name="home_login__input_phone_email">璇疯緭鍏ユ墜鏈哄彿/閭鍙�</string>
+    <string name="home_login_input_phone_email">璇疯緭鍏ユ墜鏈哄彿/閭鍙�</string>
     <string name="home_login_input_phone">璇疯緭鍏ユ墜鏈哄彿</string>
     <string name="home_login_email_address">閭鍙�</string>
     <string name="home_login_input_psw">璇疯緭鍏ュ瘑鐮�</string>
@@ -325,5 +325,7 @@
     <string name="capture_no_network">褰撳墠缃戠粶涓嶅彲鐢�,璇锋鏌ョ綉缁滃悗鍐嶈瘯</string>
     <string name="capture_no_result2">娌℃湁鎵弿鍑虹粨鏋滐紝鍙兘涓嶆槸鏈夋晥鐨勪簩缁寸爜</string>
     <string name="scan_cancel">鍙栨秷</string>
+    <string name="not_delivery_qr_code">涓嶆槸浜や粯浜岀淮鐮�.</string>
+
 
 </resources>
\ No newline at end of file

--
Gitblit v1.8.0