Merge branch 'ppt_select_all_0102' into debug

# Conflicts:
#	models/db.go

models/business_conf.go

@@ -20,6 +20,9 @@ const (
 	BusinessConfWatermarkChart    = "WatermarkChart"
 	BusinessConfIsReportApprove   = "IsReportApprove"
 	BusinessConfReportApproveType = "ReportApproveType"
+	BusinessConfCompanyName      = "CompanyName"
+	BusinessConfCompanyWatermark = "CompanyWatermark"
+	BusinessConfWatermarkChart   = "WatermarkChart"
 )
 
 const (

models/roadshow/calendar.go

@@ -33,9 +33,10 @@ func GetResearcherGroup() (list []*ResearcherGroup, err error) {
 
 func GetResearcher() (list []*Researcher, err error) {
 	o := orm.NewOrm()
-	sql := ` SELECT * FROM admin AS a
-			WHERE a.role_type_code IN('researcher','rai_researcher','ficc_researcher','ficc_admin')
-			AND a.enabled=1 AND a.real_name<>'于菲' `
+	//sql := ` SELECT * FROM admin AS a
+	//		WHERE a.role_type_code IN('researcher','rai_researcher','ficc_researcher','ficc_admin')
+	//		AND a.enabled=1 AND a.real_name<>'于菲' `
+	sql := ` SELECT * FROM admin AS a WHERE a.enabled=1 `
 	_, err = o.Raw(sql).QueryRows(&list)
 	return
 }