Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git...

星伟

2018-09-26 5406dfa891fa58cdb0e26a245de2287b49d082a0

Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

 gx_tieta/src/global_zh_CN.properties

@@ -1009,6 +1009,7 @@
#################### endure.jsp  ############################

Battery_life=\u7535\u6c60\u7ec4\u7eed\u822a\u80fd\u529b

Batt_life_history_query=\u7535\u6c60\u7eed\u822a\u80fd\u529b\u5386\u53f2\u67e5\u8be2

Station_life_query = \u673a\u623f\u7eed\u822a\u80fd\u529b\u67e5\u8be2

real_time = \u5b9e\u65f6

Endurance = \u7eed\u822a

Cruising_ability=\u7eed\u822a\u80fd\u529b