Merge branch 'cygx_12.4' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

models/activity.go

@@ -556,7 +556,7 @@ func UpdateActivitySattusToHaveInHand() (err error) {
 	sqlOr = condition
 	condition += ` AND (activity_type_id IN ( 1, 2, 3, 7 ) AND  activity_time > ` + "'" + resultTime_30 + "'" + ")"
 	condition += ` OR(activity_type_id IN ( 4, 5, 6, 8 ) AND  activity_time > ` + "'" + resultTime_60 + "'" + sqlOr + ")"
-	msql := " UPDATE cygx_activity SET active_state = 2 WHERE 1 = 1 " + condition
+	msql := " UPDATE cygx_activity SET active_state = 2, top_time = 0  WHERE 1 = 1 " + condition
 	_, err = o.Raw(msql).Exec()
 	return
 }

models/chart_permission.go

@@ -10,6 +10,7 @@ type ChartPermission struct {
 	PermissionName    string `description:"权限名称"`
 	IsShowSustainable bool   `description:"是否展示限免标签"`
 	ImageUrlM         string `description:"图片地址"`
+	IsChoose          bool   `description:"是否选择"`
 }
 
 type ActivityChartPermission struct {