Merge branch 'saas'

src/main/java/com/gogirl/interfaces/customer/CustomerInfoEnumController.java

@@ -10,6 +10,7 @@ import com.gogirl.infrastructure.common.base.JsonResult;
 import com.gogirl.infrastructure.common.util.SessionUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -35,8 +36,8 @@ public class CustomerInfoEnumController {
     @LoginIgnore
     @ApiOperation("职业偏好查询")
     @GetMapping("/list")
-    public JsonResult<List<CustomerInfoEnum>> list() {
+    public JsonResult<List<CustomerInfoEnum>> list(@RequestHeader("brandId") Integer brandId) {
         return JsonResult.success(customerInfoEnumService.list(new LambdaQueryWrapper<CustomerInfoEnum>()
-                .eq(CustomerInfoEnum::getBrandId, SessionUtils.getCustomerToken().getBrandId())));
+                .eq(CustomerInfoEnum::getBrandId, brandId)));
     }
 }