My wife and I will be entering Shanghai, Pudong airport in March next year

and staying for two nights in a hotel. We depart on the Queen Mary and the next port of call is Hong Kong. Will we be eligible to enter without a visa and do the airline companies understand this. We will be flying with Thai airways.

Thanks so much for your answer