minipro_standard/pages.json
@@ -127,7 +127,6 @@ } }, { <<<<<<< HEAD "path": "pages/newTransfer/newTransfer", "style": { "navigationBarTitleText": "新建转库", @@ -154,7 +153,8 @@ "navigationBarTitleText": "工单报工", "enablePullDownRefresh": false } ======= }, { "path": "pages/manualFeed/manualFeed", "style": { "navigationBarTitleText": "手动投料", @@ -174,7 +174,6 @@ "navigationBarTitleText": "工单报工", "enablePullDownRefresh": false } >>>>>>> a52f13d719ee9cd53f129f4c59dcad783977fce9 }, { "path": "pages/transferList/transferList",
