Browse Source

no message

xingzai 2 years ago
parent
commit
80a6fc9221
2 changed files with 3 additions and 3 deletions
  1. 2 2
      controllers/user.go
  2. 1 1
      models/report_selection.go

+ 2 - 2
controllers/user.go

@@ -12,7 +12,7 @@ import (
 	"time"
 )
 
-//用户
+// 用户
 type UserController struct {
 	BaseAuthController
 }
@@ -1721,4 +1721,4 @@ func (this *UserController) Tracking() {
 	br.Msg = "新增成功!"
 	br.Ret = 200
 	br.Success = true
-}
+}

+ 1 - 1
models/report_selection.go

@@ -145,7 +145,7 @@ type CygxReportSelectionLog struct {
 // 列表
 func GetReportSelectionlogListAll(articleId int) (items []*CygxReportSelectionLog, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT c.permission_name ,c.image_url,s.subject_name , l.* 
+	sql := `SELECT c.permission_name ,c.image_url,s.subject_name , l.*  ,l.company_label as label
 			FROM
 			cygx_report_selection_log AS l
 			INNER JOIN chart_permission AS c ON c.chart_permission_id = l.chart_permission_id