Merge remote-tracking branch 'origin/master'

src/main/java/com/sqx/modules/travelconf/entity/TravelConf.java

@@ -40,7 +40,7 @@ public class TravelConf implements Serializable {
     private Integer pricingType;
 
     /**
-     * 出行方式(1:免费,2:出租,3:公共交通)
+     * 出行方式(1:公交,2:出租,3:免费)
      */
     private Integer travelType;
 

src/main/java/com/sqx/modules/travelconf/enums/TravelEnum.java

@@ -37,17 +37,17 @@ public class TravelEnum {
 	public enum TravelType {
 
 		/***
-		 * 免费
+		 * 公交
 		 */
-		FREE(1),
+		MASS_TRANSIT(1),
 		/**
 		 * 出租
 		 */
 		TAXI(2),
 		/**
-		 * 公共交通
+		 * 免费
 		 */
-		MASS_TRANSIT(3);
+		FREE(3);
 
 		private final Integer value;