Does section 654 of the California Criminal Code require a domestic violence enhancement or a great bodily injury enhancement?

The present case does not involve dual enhancements but involves overlap of an enhancement and the underlying offense. Defendant argues that the trial court should not have imposed the domestic violence enhancement because it overlapped with the underlying offense of corporal injury to a cohabitant. Defendant attempts to distinguish People v. Chaffer (2003) 111 Cal.App.4th 1037, 1044-1045, holding that section 654 does not bar punishment for both (1) an offense and (2) a great bodily injury enhancement.