Merge branch 'dev_lxw' of http://whyclxw@118.89.139.230:10101/r/~whyclxw/gx...

霍东伟

2019-02-21 bef98803dbda70985753df52cc13c193cc71639c

Merge branch 'dev_lxw' of http://whyclxw@118.89.139.230:10101/r/~whyclxw/gx_tieta.git into dev_lxw

 gx_tieta/WebRoot/WEB-INF/classes/global_zh_CN.properties

@@ -1127,4 +1127,8 @@
Batch_sys_param_set = \u6279\u91cf\u7cfb\u7edf\u53c2\u6570\u8bbe\u7f6e



##################  bts-comm-mon.jsp      #########################

Batt_conn_info_query = \u7535\u6c60\u7ec4\u8fde\u63a5\u4fe1\u606f\u67e5\u8be2
Batt_conn_info_query = \u7535\u6c60\u7ec4\u8fde\u63a5\u4fe1\u606f\u67e5\u8be2



##################  ele-change-manage.jsp   #########################

Station_batt_replace_query = \u673a\u623f\u7535\u6c60\u66f4\u6362\u8bb0\u5f55\u67e5\u8be2




 gx_tieta/src/global_zh_CN.properties

@@ -1127,4 +1127,8 @@
Batch_sys_param_set = \u6279\u91cf\u7cfb\u7edf\u53c2\u6570\u8bbe\u7f6e



##################  bts-comm-mon.jsp      #########################

Batt_conn_info_query = \u7535\u6c60\u7ec4\u8fde\u63a5\u4fe1\u606f\u67e5\u8be2
Batt_conn_info_query = \u7535\u6c60\u7ec4\u8fde\u63a5\u4fe1\u606f\u67e5\u8be2



##################  ele-change-manage.jsp   #########################

Station_batt_replace_query = \u673a\u623f\u7535\u6c60\u66f4\u6362\u8bb0\u5f55\u67e5\u8be2