Merge branch '24年6月海外会议' into 24年6月功能安全中心

# Conflicts:
#	src/enums/commonEnums.js
#	src/views/incomePayments/meetManage/AddOrDetailMeet.vue
#	src/views/incomePayments/meetManage/Attendance.vue
#	src/views/incomePayments/meetManage/SignUpInfoEdit.vue
#	src/views/incomePayments/meetManage/modules/UploadMeetFileModal.vue
#	src/views/projectManagement/AllMeetingList.vue
This commit is contained in:
danshihao
2024-07-03 10:44:48 +08:00
10 changed files with 1068 additions and 17 deletions
+4 -1
View File
@@ -32,6 +32,8 @@ const getStandardNumberList = (params) => getAction('/meeting/standardsMeeting/g
// 国际研讨会-WASIC-通过会议ID获取关联主题的信息
const getLinkTopics = (params) => getAction('/meeting/internalMeeting/getLinkTopics', params)
// 通过id获取海外会议参会人详细信息
const getSingUpUserInfoOverseas = (params) => getAction('/meeting/overseasSituation/queryById', params)
export {
getUserInfo,
@@ -46,5 +48,6 @@ export {
addGenerateCodeList,
editGenerateCodeList,
getStandardNumberList,
getLinkTopics
getLinkTopics,
getSingUpUserInfoOverseas
}