From 7d8b9a16166d39e70bf3576bf77a48b7d7c93db1 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.20>
Date: 星期四, 29 十一月 2018 16:57:37 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dao/BattTestData.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/BattTestData.java b/gx_tieta/src/com/fgkj/dao/BattTestData.java
index 61869a4..fbafbec 100644
--- a/gx_tieta/src/com/fgkj/dao/BattTestData.java
+++ b/gx_tieta/src/com/fgkj/dao/BattTestData.java
@@ -286,7 +286,7 @@
state_name="绂荤嚎";
}
}else if(eve_type==20){
- state_name=Integer.toHexString(state);
+ state_name="0x"+Integer.toHexString(state);
}
return state_name;
}
--
Gitblit v1.9.1