Merge branch 'hotfix/bs_trip_1012'

controllers/business_trip/business_calendar.go

@@ -10,7 +10,7 @@ import (
 	"time"
 )
 
-// ResearcherReportList
+// BusinessTripCalendar
 // @Title 出差日历表
 // @Description 出差日历表接口
 // @Param   AdminId   query   string  false       "用户id,多个用英文逗号分开"
@@ -190,6 +190,7 @@ func (this *BusinessTrip) BusinessTripCalendar() {
 							tripItem.City = r.City
 							tripItem.BusinessApplyId = r.BusinessApplyId
 							tripItem.Status = r.Status
+							tripItem.Reason = r.Reason
 						}
 					}
 
@@ -212,6 +213,7 @@ func (this *BusinessTrip) BusinessTripCalendar() {
 							tripItem.City = r.City
 							tripItem.BusinessApplyId = r.BusinessApplyId
 							tripItem.Status = r.Status
+							tripItem.Reason = r.Reason
 						}
 					}
 					tripItem.WeekDate = weekDate

models/business_trip/business_calendar.go

@@ -17,6 +17,7 @@ type BusinessTripCalendar struct {
 	City            string `description:"城市"`
 	Week            string `description:"周"`
 	WeekType        string `description:"当前周:current,下一周:next"`
+	Reason          string `description:"出差事由"`
 }
 
 // GetResearcherV2 获取研究员列表（冻结的也要）