fiee/micro-bundle
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updata;解决冲突

Browse Source
This commit is contained in:
jiaji.H 2026-03-11 18:43:47 +08:00
commit 4e00253541
3 changed files with 685 additions and 674 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
internal/dao/questionnaire_survey.go
View File

@ -40,9 +40,10 @@ func SendQuestionnaireSurvey(req *bundle.SendQuestionnaireSurveyRequest) (resp *
if err != nil { if err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) { if errors.Is(err, gorm.ErrRecordNotFound) {
resp.Status = 0 resp.Status = 0
} } else {
return resp, err return resp, err
} }
}
if questionnaireInfo.UserId != 0 { if questionnaireInfo.UserId != 0 {
resp.Status = 2 resp.Status = 2
return resp, nil return resp, nil

3
pb/bundle.proto
View File

@ -2446,7 +2446,8 @@ message CreateQuestionnaireSurveyAnswerRequest{
string surveyUrl = 4; string surveyUrl = 4;
string submitTime = 5; string submitTime = 5;
string submitBy = 6; string submitBy = 6;
string submitAddress = 7; string longitude = 7;
string latitude = 8;
} }
message CreateQuestionnaireSurveyAnswerResponse{ message CreateQuestionnaireSurveyAnswerResponse{

1353
pb/bundle/bundle.pb.go
View File

File diff suppressed because it is too large Load Diff