Visa-free?

Hello,

We have Turkish citizenship. We are going to Shanghai with our tourist L. Then, we will go to Seoul and Tokyo. On the way back home, 10 days later, can we come back to China and use Shanghai Airport to transfer our country? Do we need a visa again, or can we use the 24-hour free option?

Thank you!