Updata：解决冲突

internal/logic/questionnaire_survey.go

@@ -64,6 +64,7 @@ func GetQuestionnaireSurveyList(req *bundle.GetQuestionnaireSurveyListRequest) (
 		return &bundle.SurveyListInfo{
 			UserName:     m.UserName,
 			UserTel:      m.UserTel,
+			UserNum:      m.UserNum,
 			SurveyTitle:  m.SurveyTitle,
 			SurveyStatus: int32(m.SurveyStatus),
 			SurveyUrl:    m.SurveyUrl,

pb/bundle.proto

@@ -2463,9 +2463,10 @@ message GetQuestionnaireSurveyListRequest{
 message SurveyListInfo{
   string userName = 1;
   string userTel = 2;
-  string surveyTitle = 3;
-  int32 surveyStatus = 4;
-  string surveyUrl = 5;
+  string userNum = 3;
+  string surveyTitle = 4;
+  int32 surveyStatus = 5;
+  string surveyUrl = 6;
 }
 
 message GetQuestionnaireSurveyListResponse{