Merge branch 'cygx_9.2' into debug

models/cygx_morning_meeting_review_chapter.go

@@ -123,7 +123,7 @@ func DeleteMorningMeetingChapterById(chapterId int) (err error) {
 
 func GetCygxMorningMeetingReviewsListByIndustrialIds(industrialIds string) (items []*CygxMorningMeetingReviewChapter, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT * FROM cygx_morning_meeting_reviews WHERE industry_id IN (` + industrialIds + `)  `
+	sql := `SELECT * FROM cygx_morning_meeting_review_chapter WHERE industry_id IN (` + industrialIds + `)  `
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
 }

models/page_history_record.go

@@ -67,7 +67,7 @@ func GetTimeLineRecordItem(userId, industrialManagementId int) (item *CygxPageHi
 
 func GetTimeLineRecordAllCount(userId int, date string) (items []*CygxPageHistoryRecord, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT * AS count FROM cygx_page_history_record WHERE user_id=? AND router LIKE '%/api/report/industry/ArticleList?PageSize=10&CurrentIndex=1&CategoryId=99999&IndustrialManagementId=%' AND create_time > ? `
+	sql := `SELECT * FROM cygx_page_history_record WHERE user_id=? AND router LIKE '%/api/report/industry/ArticleList?PageSize=10&CurrentIndex=1&CategoryId=99999&IndustrialManagementId=%' AND create_time > ? `
 	_, err = o.Raw(sql, userId, date).QueryRows(&items)
 	return
 }