Can I use the 72 hours visa for 2 days in Guangzhou and 1 in Shanghai?

I will arrive in Guangzhou at 15:30 on 20 November from from Bangkok. On 22 November I will start my return international flight. At 13:30 I'll fly from Guangzhou to Shanghai Hongquiao airport and transfer to Pudong airport to board the flight that departs at 20:20 from Pudong. Unfortunately, I have to change airports in Shanghai for my CAN - Shanghai - SYD flight. Will the 72 hours free transit that I will get in Guangzhou cover me for both Guangzhou stay and Shanghai transfer?