解决同步冲突

area_business.cpp

@@ -140,7 +140,6 @@ struct area_business_restricted:area_business
 #include "area_business_person_attendance.h"
 #include "area_business_post_area.h"
 #include "area_business_speed_checker.h"
->>>>>>> 9972966e8ab3d9a55d0a26abd281ca082b8608ac
 
 /*
 	猴车区域