Merge branch 'cygx_8.2' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

models/activity.go

@@ -384,6 +384,10 @@ func GetScheduleAndSpecilList(condition string, pars []interface{}, conditionSpe
 			art.speaker,
 			"" AS trip_img_link,
 			"" AS activity_time_end,
+			art.yidong_activity_id,
+			art.is_can_appointment_minutes,
+			art.activity_type_id,
+			art.limit_people_num,
 			1 AS source_type,
 			art.activity_time 
 		FROM
@@ -410,6 +414,10 @@ func GetScheduleAndSpecilList(condition string, pars []interface{}, conditionSpe
 			"",
 			art.trip_img_link_fix AS trip_img_link,
 			art.activity_time_end,
+			"",
+			"",
+			"",
+			"",
 			2 AS source_type,
 			art.activity_time 
 		FROM