The one who comes to mind first is Jean de Lattre de Tassigny, who fought as a junior officer in World War I, commanded the First French Army in 1944-1945, and then commanded the French forces in Indochina in 1950 and 1951.

I believe if you look at the commanders and higher-ranking officers of the French Far East Expeditionary Corps (the French force during the First Indochina War), you'll find a number of officers who were veterans of the two world wars.