Merge branch 'master' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

# Conflicts:
#	controllers/activity.go

controllers/activity.go

@@ -4250,7 +4250,7 @@ func (this *ActivityCoAntroller) LabelTypeListV6Pc() {
 	if whichDay == "undefined" {
 		whichDay = ""
 	}
-	if activeState == "undefined" || activeState == "" {
+	if activeState == "undefined" || activeState == "" || activeState == "1" {
 		activeState = "1,2"
 	}
 	userType, permissionStr, err := services.GetUserType(user.CompanyId)