From f52d3b910556fcadf0ae262bafa251756e06488c Mon Sep 17 00:00:00 2001
From: 军 <军@hp-pc>
Date: 星期日, 30 九月 2018 11:41:48 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dao/BattTestData.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/BattTestData.java b/gx_tieta/src/com/fgkj/dao/BattTestData.java
index 3723b1c..1bae5f1 100644
--- a/gx_tieta/src/com/fgkj/dao/BattTestData.java
+++ b/gx_tieta/src/com/fgkj/dao/BattTestData.java
@@ -1,7 +1,12 @@
package com.fgkj.dao;
public class BattTestData {
-final public static int BATT_MON_COUNT_MAX = 512;
+ 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;
final public static byte BATTDATA_FLOAT = 1;
--
Gitblit v1.9.1