City of Arrival & City of Departure for Tourist Visa

Hi for City of Arrival and City of Departure I put Guangzhou, is that okay?

I'm flying to Guangzhou first and going past immigration in Guangzhou, and then a domestic flight from Guangzhou to Beijing. On the way back, I'm flying domestic from Lijiang to Guangzhou and going through immigration in Guangzhou for a flight from Guangzhou out of China.