jollity vs good humor

jollity and good humor both are nouns.

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

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

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

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