US citizen visits South Korea plans a short tour with travel agent to China, is a visa needed?

I am a US citizen visiting my boyfriend in South Korea. We are planning a short tour to PRC, primarily visiting the Great Wall, organized by South Korean travel agent. I will return to South Korea before returning to the US. Do I need an entry permit and how do I get it?