From b5f2f7d2d166d0eeea84330ddd320a5cbcf8f778 Mon Sep 17 00:00:00 2001
From: cjw <1063165173@qq.com>
Date: Thu, 16 Sep 2021 17:10:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E9=A1=B5=E9=9D=A2=20=E5=B7=A5?=
 =?UTF-8?q?=E5=BA=8F=E5=A7=94=E5=A4=96=E5=90=8D=E7=A7=B0=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?+app=E5=9B=BE=E6=A0=87=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 844609e..90a4916 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -37,7 +37,7 @@
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
+        android:roundIcon="@mipmap/ic_launcher"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         android:usesCleartextTraffic="true">
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5634749..ab8f314 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -17,10 +17,10 @@
     <string name="InvTransOut">两步调出</string>
     <string name="InvTransIn">两步调入</string>
     <string name="OpTransfer">移库扫描</string>
-    <string name="WWKG">工序委外</string>
+    <string name="WWKG">工序委外发料</string>
     <string name="InvTrans">一步调入</string>
     <string name="ICSCheckIn">盘点扫描</string>
-    <string name="WXItemIn">委外入库</string>
+    <string name="WXItemIn">工序委外入库</string>
     <string name="SetPrinter">设置/切换打印设备</string>
     <string name="default_loading_dialog_text">处理中...</string>
     <string name="WSDLURL">http://10.0.0.41//ZNZKPDA/PDA.asmx</string>