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

hdw

2019-01-19 7f953d9aa0e7d4fcbe3c366c7f9f0b3f847f12bd

 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;

   }