fix: 添加合并被删除的代码

app/src/main/AndroidManifest.xml

@@ -341,47 +341,85 @@
         <activity
             android:name=".project.ui.activity.mail.InfoTabActivity"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait" /> <!-- 审核 -->
+            android:screenOrientation="portrait" />
+        <!-- 审核 -->
         <activity
             android:name=".project.ui.activity.order.AuditingActivity"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait" /> <!-- 充值记录 -->
+            android:screenOrientation="portrait" />
+        <!-- 充值记录 -->
         <activity
             android:name=".project.ui.activity.after.RechargeRecordActivity"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait" /> <!-- 申请退款 -->
+            android:screenOrientation="portrait" />
+        <!-- 申请退款 -->
         <activity
             android:name=".project.ui.activity.after.ApplyReturnMoneyActivity"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait" /> <!-- 撤销圈存 -->
+            android:screenOrientation="portrait" />
+        <!-- 撤销圈存 -->
         <activity
             android:name=".project.ui.activity.after.UndoLoopActivity"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait" /> <!-- 忘记密码第一步 -->
+            android:screenOrientation="portrait" />
+        <!-- 忘记密码第一步 -->
         <activity
             android:name=".project.ui.activity.user.ForgetPwdStep1Activity"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait" /> <!-- 忘记密码第二步 -->
+            android:screenOrientation="portrait" />
+        <!-- 忘记密码第二步 -->
         <activity
             android:name=".project.ui.activity.user.ForgetPwdStep2Activity"
             android:launchMode="singleTop"
             android:screenOrientation="portrait"
-            android:windowSoftInputMode="adjustPan" /> <!-- 忘记密码第三步 -->
+            android:windowSoftInputMode="adjustPan" />
+        <!-- 忘记密码第三步 -->
         <activity
             android:name=".project.ui.activity.user.ForgetPwdStep3Activity"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait" /> <!-- 修改密码 -->
+            android:screenOrientation="portrait" />
+        <!-- 修改密码 -->
         <activity
             android:name=".project.ui.activity.user.EditPwdActivity"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait" /> <!-- 申请换货第一步 -->
+            android:screenOrientation="portrait" />
+        <!-- 申请换货第一步 -->
         <activity
             android:name=".project.ui.activity.order.ApplyExGoodsStep1Activity"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait" /> <!-- 申请换货第二步 -->
+            android:screenOrientation="portrait" />
+        <!-- 申请换货第二步 -->
         <activity
             android:name=".project.ui.activity.order.ApplyExGoodsStep2Activity"
             android:launchMode="singleTop"
             android:screenOrientation="portrait" />
+        <activity
+            android:name=".project.ui.activity.order.ApplyReturnGoodsStep1Activity"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".project.ui.activity.order.ApplyReturnGoodsStep2Activity"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".project.ui.activity.order.CancelOrderStep1Activity"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".project.ui.activity.order.CancelOrderStep2Activity"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".project.ui.activity.order.ConfirmReceiveGoodsStep1Activity"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".project.ui.activity.order.ConfirmReceiveGoodsStep2Activity"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".project.ui.activity.order.OrderLogisticsActivity"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait" />
     </application>
 </manifest>