diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java index f79a9cba..25e55169 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java @@ -212,6 +212,10 @@ public class PayMeetingSituation implements Serializable { @ApiModelProperty(value = "到达班次") private String arrivalShift; + @Excel(name = "目的地", width = 15) + @ApiModelProperty(value = "目的地") + private String destinationHotel; + /**是否需要送站*/ @Excel(name = "是否需要送站", width = 15,dicCode = "yn") @ApiModelProperty(value = "是否需要送站") @@ -235,11 +239,6 @@ public class PayMeetingSituation implements Serializable { @ApiModelProperty(value = "离开班次") private String departureShift; - /**同行人*/ - @Excel(name = "同行人", width = 15) - @ApiModelProperty(value = "同行人") - private String peer; - /**备注*/ @Excel(name = "备注", width = 15) @ApiModelProperty(value = "备注") diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java index 0e4c3170..d3d44e3d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java @@ -1159,11 +1159,6 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl validateReturnList = ValidUtil.validateReturnList(internationalGuestVO); - //用餐 - Integer haveMeals = internationalGuestVO.getHaveMeals(); - if (haveMeals.equals(MeetingSubitemCommon.HAVE_MEALS)) { - validateReturnList.addAll(ValidUtil.validateReturnList(internationalGuestVO, HaveMeals.class)); - } //接站 Integer pickUp = internationalGuestVO.getPickUp(); if (pickUp.equals(MeetingSubitemCommon.PICK_UP)) { @@ -1177,6 +1172,11 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl