作者 Your Name

Merge branch 'dev' into test

... ... @@ -533,7 +533,7 @@ func (srv ProductTroubleService) ListRewardSummary(param *query.ListRewardSummar
if err != nil {
return 0, nil, application.ThrowError(application.ARG_ERROR, "日期格式错误")
} else {
endDate.Add((86400 - 1) * time.Second)
endDate = endDate.Add((86400 - 1) * time.Second)
condition["endDate"] = endDate
}
... ... @@ -559,7 +559,7 @@ func (srv ProductTroubleService) ListRewardSummary(param *query.ListRewardSummar
for _, v := range rewardSummaryList {
item := dto.RewardSummaryList{
Id: v.Id,
RecordDate: v.RecordDate.Format("2006-01-02"),
RecordDate: v.RecordDate.Local().Format("2006-01-02"),
WorkshopName: v.WorkStation.WorkshopName,
LineName: v.WorkStation.LineName,
SectionName: v.WorkStation.SectionName,
... ...