Merge branch 'cygx/cygx_12.1' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

models/db.go

@@ -453,12 +453,12 @@ func initCygx() {
 		new(cygx.CygxResourceDataIndustrialGroupManagement),
 		new(cygx.CygxResourceDataIndustrialGroupSubject),
 		new(cygx.CygxYanxuanSpecialAuthor),
-		new(cygx.CygxQuestionnaire),
-		new(cygx.CygxQuestionnaireTheme),
 		new(cygx.CygxAllocationCompanyContract),
 		new(cygx.CygxAllocationCompanyContractLog),
 		new(cygx.CygxAllocationCompanyContractPermission),
 		new(cygx.CygxAllocationCompanyContractPermissionLog),
+		new(cygx.CygxQuestionnaire),
+		new(cygx.CygxQuestionnaireTheme),
 	)
 }
 

routers/router.go

@@ -154,8 +154,8 @@ func init() {
 				&cygx.BannerCoAntroller{},
 				&cygx.TagManagementController{},
 				&cygx.YanxuanSpecialController{},
-				&cygx.QuestionnaireController{},
 				&cygx.ContractAllocationController{},
+				&cygx.QuestionnaireController{},
 			),
 		),
 		web.NSNamespace("/advisory",