A senior French diplomat has called for "an amicable settlement" to the long-running row between Danone and Hangzhou Wahaha in China.