No, the endomembrane system lies between the nuclear envelope and the cell membrane; dis-including both.
The Endoplasmic reticulum and the Golgi apparatus are two members of the endomembrane system. Google endomembrane system to get the complete picture.