jollity vs good humour

jollity and good humour both are nouns.

Word	Noun	Adjective	Verb	Adverb
jollity	Yes	No	No	No
good humour	Yes	No	No	No

As nouns, good humour is a hypernym of jollity; that is, good humour is a word with a broader meaning than jollity:

Other hypernyms of jollity include gaiety, merriment, amiability, good humor, good temper.

jollity (noun)	good humour (noun)
feeling jolly and jovial and full of good humor	a cheerful and agreeable mood