During the process the CAAC will liaise with your licence NAA. Neither should be a problem, take your pick. In case of need for a no incident report (see the ME thread, though still confusing), the more recent JCAB will work better. I strongly suggest you disclose both and let them handle it.
Smoking is done with, severe penalties in place. Up to 6 months grounding for those who just do not report others. (different CAAC region, different airline).