Merge branch 'master' into feature/merge-captcha

@@ -22,7 +22,7 @@ exports.index = (req, res, next) => {
     brandsService.getBrandViewList(channel, req).then(result => {
         // 返回null，不cashe
         if (result.noCashe) {
-            res.set('Cashe-Control', 'no-cashe');
+            res.set('Cache-Control', 'no-cache');
         }
         res.render('brands/brands', result);
 
@@ -55,7 +55,7 @@ exports.brandInfo = (req, res, next) => {
     brandsService.brandInfo(brandId, req.user.uid).then(result => {
         // 返回null，不cashe
         if (result.noCashe) {
-            res.set('Cashe-Control', 'no-cashe');
+            res.set('Cache-Control', 'no-cache');
         }
         res.json(result);
     }).catch(next);
@@ -70,7 +70,7 @@ exports.plusstarList = (req, res, next) => {
     brandsService.plusstarList(channel, req).then(result => {
         // 返回null，不cashe
         if (result.noCashe) {
-            res.set('Cashe-Control', 'no-cashe');
+            res.set('Cache-Control', 'no-cache');
         }
         res.render('brands/plusstar', result);
     }).catch(next);