Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git ...

Administrator

2018-12-20 4845b337be059e93621d353b5c2e57ac480a8e33

 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;

   }