fix

controllers/company.go

@@ -9132,15 +9132,17 @@ func (this *CompanyTodoController) CompanyActivitySpecialPointsBill() {
 	}
 	for _, v := range list {
 		item := cygx.CygxActivitySpecialPointsBillResp{
-			Id:           v.Id,
-			Content:      "",
-			Total:        specialSurplus,
-			CreateTime:   v.CreateTime.Format(utils.FormatDateTime),
-			CompanyId:    v.CompanyId,
-			CompanyName:  v.CompanyName,
-			RealName:     v.RealName,
-			BillDetailed: v.BillDetailed,
-			ActivityName: v.ActivityName,
+			Id:                  v.Id,
+			Content:             v.ActivityName,
+			Total:               specialSurplus,
+			CreateTime:          v.CreateTime.Format(utils.FormatDateTime),
+			CompanyId:           v.CompanyId,
+			CompanyName:         v.CompanyName,
+			RealName:            v.RealName,
+			BillDetailed:        v.BillDetailed,
+			ActivityName:        v.ActivityName,
+			ChartPermissionId:   v.ChartPermissionId,
+			ChartPermissionName: v.ChartPermissionName,
 		}
 		resp = append(resp, &item)
 	}

models/cygx/activity_special_trip_bill.go

@@ -131,13 +131,15 @@ func GetCygxActivitySpecialTripBillDetailList(condition string, pars []interface
 }
 
 type CygxActivitySpecialPointsBillResp struct {
-	Id           int    `gorm:"column:id;primary_key;AUTO_INCREMENT"`
-	Content      string `gorm:"column:content" `                                 // 内容说明
-	Total        string `gorm:"column:points;default:0;NOT NULL" `               // 合计
-	CreateTime   string `gorm:"column:create_time" `                             // 创建时间
-	CompanyId    int    `gorm:"column:company_id;default:0" `                    // 公司ID
-	CompanyName  string `gorm:"column:company_name" `                            // 公司名称
-	RealName     string `gorm:"column:real_name"`                                // 用户实际名称
-	BillDetailed int    `gorm:"column:bill_detailed;default:0;NOT NULL" json:""` // 流水明细，判断是进账还是出账
-	ActivityName string `description:"活动标题"`
+	Id                  int    `gorm:"column:id;primary_key;AUTO_INCREMENT"`
+	Content             string `gorm:"column:content" `                                 // 内容说明
+	Total               string `gorm:"column:points;default:0;NOT NULL" `               // 合计
+	CreateTime          string `gorm:"column:create_time" `                             // 创建时间
+	CompanyId           int    `gorm:"column:company_id;default:0" `                    // 公司ID
+	CompanyName         string `gorm:"column:company_name" `                            // 公司名称
+	RealName            string `gorm:"column:real_name"`                                // 用户实际名称
+	BillDetailed        int    `gorm:"column:bill_detailed;default:0;NOT NULL" json:""` // 流水明细，判断是进账还是出账
+	ActivityName        string `description:"活动标题"`
+	ChartPermissionId   int    `description:"行业id"`
+	ChartPermissionName string `description:"行业名称"`
 }