Merge remote-tracking branch 'origin/master'

liujie

9 天以前 7342170db7dc39326698d39b74e1858502fd574a

 MessagePushTravel/src/main/java/com/sinata/push/util/echo/Method.java

@@ -15,6 +15,9 @@
   /** 心跳【接收】 */
   public final static String ping = "PING";

   /** 心跳【响应】 */
   public final static String pong = "PONG";

   /** 司机上传位置 */
   public static final String location = "LOCATION";