update esmapping
update es_mapping
Merge branch 'sprint8' into mingshu
modified esmapper
Merge branch 'mingshu' into sprint8