modify email
邮件管理js
Merge branch 'ubuntujshoper3'

Conflicts

Signed-off-by: chenda <chenda@chenda-Aspire-5820TG.(none)>
Signed-off-by: chenda <chenda@chenda-Aspire-5820TG.(none)>
修正了email相关的问题
Signed-off-by: chenda <chenda@chenda-Aspire-5820TG.(none)>
Merge branch 'master' into ubuntujshoper3