解决冲突

issueActivation/old-user.vue

@@ -1,4 +1,3 @@
-<!-- 新增车辆 -->
 <template>
 	<view class="box">
 		<view class="title">公务车车牌号</view>

pages.json

@@ -1268,6 +1268,20 @@
       //发行激活模块
       "root": "issueActivation",
       "pages": [
+        {
+          "path": "old-user",
+          "style": {
+            "navigationBarTitleText": "历史用户申请",
+            "enablePullDownRefresh": true
+          }
+        },
+        {
+          "path": "address",
+          "style": {
+            "navigationBarTitleText": "邮寄地址",
+            "enablePullDownRefresh": true
+          }
+        },
         {
           "path": "install-activation-order",
           "style": {