From 9ddc2aee31b9afc21659b378932a0f46f43071c2 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@192.168.10.24>
Date: 星期日, 30 九月 2018 11:50:57 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/src/com/fgkj/dao/BattTestData.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/dao/BattTestData.java b/gx_tieta/src/com/fgkj/dao/BattTestData.java
index 8912670..1bae5f1 100644
--- a/gx_tieta/src/com/fgkj/dao/BattTestData.java
+++ b/gx_tieta/src/com/fgkj/dao/BattTestData.java
@@ -4,6 +4,8 @@
 	final public static int BATT_DISCHARGE=3;//鏀剧數娴嬭瘯
 	final public static int BATT_RES=5;//鍐呴樆娴嬭瘯
 	
+	final public static int AppServer_Reinit_BattGroupData_EN=1;//淇敼鍒犻櫎娣诲姞鐢垫睜缁勪俊鎭椂璇嗗埆淇″彿
+	
     final public static int BATT_MON_COUNT_MAX = 512;
 	
 	final public static byte BATTDATA_NULL = 0;

--
Gitblit v1.9.1