Merge branch 'dev4.6.3.2' of http://192.168.3.207:8080/qmx/jy into dev4.6.3.2

src/jfw/active/21yearEndReport.go

@@ -43,7 +43,12 @@ func init() {
 //YearEndReport 21年，年终报告
 type YearEndReport struct {
 	*xweb.Action
-	yearEndReportPage xweb.Mapper `xweb:"/active/yearEndReport"` //21年终报告wx页面
+	yearEndReportPage   xweb.Mapper `xweb:"/active/yearEndReport"`       //21年终报告wx页面
+	yearEndReportResult xweb.Mapper `xweb:"/active/yearEndReportResult"` //21年终报告wx结果页面
+}
+
+func (this *YearEndReport) YearEndReportResult() error {
+	return this.Render("/active/yearEndReport/result.html")
 }
 
 func (this *YearEndReport) YearEndReportPage() error {

src/jfw/modules/app/src/app/active/21yearEndReport.go

@@ -34,7 +34,12 @@ func init() {
 //YearEndReport 21年，年终报告
 type YearEndReport struct {
 	*xweb.Action
-	yearEndReportPage xweb.Mapper `xweb:"/jyapp/active/yearEndReport"` //21年终报告app页面
+	yearEndReportPage   xweb.Mapper `xweb:"/jyapp/active/yearEndReport"`       //21年终报告app页面
+	yearEndReportResult xweb.Mapper `xweb:"/jyapp/active/yearEndReportResult"` //21年终报告app结果页面
+}
+
+func (this *YearEndReport) YearEndReportResult() error {
+	return this.Render("/active/yearEndReport/result.html")
 }
 
 func (this *YearEndReport) YearEndReportPage() error {