Merge branch 'cygx_9.4.0' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

models/activity.go

@@ -992,6 +992,7 @@ func GetActivitySpecialSearcheList(condition string, pars []interface{}, conditi
 			art.is_can_appointment_minutes,
 			art.activity_type_id,
 			art.limit_people_num,
+			art.is_limit_people,
 			1 AS source_type,
 			art.activity_time 
 		FROM
@@ -1020,6 +1021,7 @@ func GetActivitySpecialSearcheList(condition string, pars []interface{}, conditi
 			"",
 			"",
 			"",
+			"",
 			2 AS source_type,
 			art.activity_time 
 		FROM