修改编译

src/pages/package/record/splitPackageRecord.vue

@@ -114,23 +114,10 @@
 			};
 		},
 		onLoad(option) {
-<<<<<<< Updated upstream
 			uni.setNavigationBarTitle({
 			  title: option.title
 			})
-			var typeCode = "SplitPackage"
-			getBusinessType(typeCode, res => {
-				if (res.success) {
-					this.businessType = res.businessType;
-					this.fromLocationAreaTypeList = res.fromLocationAreaTypeList;
-					this.showFromLocationPopup();
-				} else {
-					this.showErrorMessage(res.message)
-				}
-			});
-=======
 			this.getBusinessType();
->>>>>>> Stashed changes
 		},
 		//返回首页
 		onNavigationBarButtonTap(e) {