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

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

@@ -108,9 +108,13 @@ public class RedirectController {
     public String activityTopics2(@RequestParam("id") Integer id) {
         return "redirect:/product/activity-"+id+".html";
     }
-    @GetMapping("/product/beautytopic.html")
-    public String activityTopics3() {
-        return "redirect:/product/beauty.html";
+
+    /**
+     * 云上美博会
+     */
+    @GetMapping("/cmpage/info-7-{id}.html")
+    public String activityTopics3(@PathVariable("id") Integer id) {
+        return "redirect:/product/beauty-" + id + ".html";
     }
 
     /**