Visa Requirement for cruise passenger in port for 16 hours

We are Canadian citizens. We are going on a cruise that will stop in Shanghai from 6am to 10pm coming form Tokohama, Japan and going to Okinawa Japan after Shanghai. Do we need a visa to go on a day tour in Shanghai? Does the 24 hrs free transit apply?

Thank you