Merge branch 'refs/heads/feat-sql-log'

dao/video.go

@@ -118,9 +118,9 @@ func FindVideoListsByAuthID(auth_id int) []Video {
 func FindVideoListByTime(auth_id int, startTime, endTime string) []Video {
 	var videos []Video
 	if proto.Config.SERVER_SQL_LOG {
-		DB.Debug().Where("auth_id = ?", auth_id).Where("create_time > ? and create_time < ? and isdelete=0 and deleted_at is null", startTime, endTime).Find(&videos)
+		DB.Debug().Where("auth_id = ?", auth_id).Where("create_time > ? and create_time < ? and isdelete=0", startTime, endTime).Find(&videos)
 	} else {
-		DB.Where("auth_id = ?", auth_id).Where("create_time > ? and create_time < ? and isdelete=0 and deleted_at is null", startTime, endTime).Find(&videos)
+		DB.Where("auth_id = ?", auth_id).Where("create_time > ? and create_time < ? and isdelete=0", startTime, endTime).Find(&videos)
 	}
 	return videos
 }