24 Hour Transit Visa for Guangzhou

Hi,
I am traveling from Canada to Sri Lanka through Guangzhou. I have a 10-hour layover at Guangzhou Airport. My boyfriend is traveling from sri Lanka to Guangzhou to pick me and going back to sri lanka with me. His layover is also 10 hours. Do we need entry permit to book a hotel near the airport for our layover hours? If we need transit visa can we get it from the airport ?

thank you!