Merge remote-tracking branch 'origin/master'

jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java

@@ -210,7 +210,7 @@ public class PayMeeting implements Serializable {
     /**
      * 会议关联酒店联系人列表
      */
-    @TableField(select = false)
+    @TableField(exist = false)
     private List<PayMeetingHotelContacts> hotelContactsList;
 
 	/**备注*/

jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java

@@ -134,9 +134,9 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
 			case MeetingCommon.STANDARD_MEETING:
 				ValidUtil.validate(payMeetingVO, StandardMeeting.class);
 				//标协会议类型
-				Map<String, String> standardMeetingType = sysBaseApi.queryDictItemsMapByCode("standard_meeting_type");
 				String tbMeetingType = payMeetingVO.getTbMeetingType();
-				if (!standardMeetingType.containsKey(tbMeetingType)){
+				String standardMeetingType = sysBaseApi.translateDict("standard_meeting_type", tbMeetingType);
+				if (standardMeetingType == null){
 					throw new JeroBootException("标协会议类型不存在");
 				}
 				hotelContactsList = payMeetingVO.getHotelContactsList();