美博会调查问卷类型

src/main/java/com/gogirl/domain/user/customer/BeautyExpoQuestionnaire.java

 package com.gogirl.domain.user.customer;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.gogirl.infrastructure.common.annotation.DictParam;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -47,4 +49,12 @@ public class BeautyExpoQuestionnaire implements Serializable {
     @ApiModelProperty(value = "意向")
     private String intention;
 
+    @ApiModelProperty(value = "1-领取礼品 2-领取课程")
+    @DictParam(dictCode = "BEAUTY_EXPO_QUESTIONNAIRE_TYPE",dictValueParam = "typeStr")
+    private Integer type;
+
+    @ApiModelProperty(value = "1-领取礼品 2-领取课程")
+    @TableField(exist = false)
+    private String typeStr;
+
 }

src/main/java/com/gogirl/interfaces/user/customer/BeautyExpoQuestionnaireController.java

@@ -10,6 +10,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
@@ -30,7 +31,7 @@ public class BeautyExpoQuestionnaireController {
 
     @ApiOperation("/是否已经填写美博会调查问卷")
     @GetMapping("/customer/beautyExpoQuestionnaire/hasSubmitted")
-    public JsonResult<Boolean> hasSubmitted() {
+    public JsonResult<Boolean> hasSubmitted(@RequestParam Integer type) {
         return JsonResult.success(beautyExpoQuestionnaireService.hasSubmitted(SessionUtils.getCustomerId()));
     }