Do I require a visa returning from Japan?

I am going to Japan by ship from Shanghai, do I need a visa to travel back into China? I have UK passport, and HKID.
So the route is basically:
Shenzhen (Air) to Shanghai (Ship) to Japan (Staying for 7 Days)
Japan (Ship) to Shanghai (Air) to Shenzhen