Merge remote-tracking branch 'origin/master'

This commit is contained in:
曹磊 2024-06-15 20:37:58 +08:00
commit 49234e2428
2 changed files with 5 additions and 5 deletions

View File

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

View File

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