Merge remote-tracking branch 'origin/main'

# Conflicts:
#	src/main/resources/views/platform/trainSingUp/manage/apply.html
This commit is contained in:
@jyuhsin
2025-09-25 11:34:04 +08:00
@@ -295,7 +295,8 @@ layout("/layouts/platform.html"){
<template v-else>
<el-button v-if="row.courseList && row.courseList.length == 1" type="text"
style="padding: 0">
{{moment(row.courseList[0].courseStartTime).format('MM-DD HH:mm')}}至{{moment(row.courseList[0].courseStartTime).format('MM-DD HH:mm')}}
{{moment(row.courseList[0].courseStartTime).format('MM-DD HH:mm')}}
至{{moment(row.courseList[0].courseStartTime).format('MM-DD HH:mm')}}
</el-button>
<el-button v-else style="padding: 0" @click="openViewCourseTime(row)" type="text">
点击查看{{trainType}}时间