Merge remote-tracking branch 'origin/developer' into developer

src/main/java/com/caimei/www/controller/RedirectController.java

@@ -75,7 +75,7 @@ public class RedirectController {
      */
     @GetMapping("/cmpage/info-5-{id}.html")
     public String classificationDetails(@PathVariable("id") Integer id,String name) {
-        // 临时活动页
+        // 美体节活动页
         if (id == 301) {
             return "redirect:/product/temporary.html?id=" + id + "&name=" + name;
         }

src/main/java/com/caimei/www/controller/unlimited/ProductController.java

@@ -74,7 +74,7 @@ public class ProductController extends BaseController {
     }
 
     /**
-     * 临时活动页
+     * 美体节活动页
      */
     @GetMapping("/product/temporary.html")
     public String temporary(){