合并线上版本5.4.2

@@ -570,7 +570,11 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
+<<<<<<< HEAD
 				MARKETING_VERSION = 6.0.0;
+=======
+				MARKETING_VERSION = 5.4.3;
+>>>>>>> 58718afe (预订安排页人数变更修改)
 				PODS_ROOT = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
 				PRODUCT_NAME = Runner;
@@ -722,7 +726,11 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
+<<<<<<< HEAD
 				MARKETING_VERSION = 6.0.0;
+=======
+				MARKETING_VERSION = 5.4.3;
+>>>>>>> 58718afe (预订安排页人数变更修改)
 				PACKAGE_CONFIG = "/Users/naji2021/Desktop/Flutter-ReserveApp/.dart_tool/package_config.json";
 				PODS_ROOT = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
@@ -763,7 +771,11 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
+<<<<<<< HEAD
 				MARKETING_VERSION = 6.0.0;
+=======
+				MARKETING_VERSION = 5.4.3;
+>>>>>>> 58718afe (预订安排页人数变更修改)
 				PODS_ROOT = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
 				PRODUCT_NAME = Runner;