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

src/main/java/com/caimei/modules/cmpage/web/CmPageCentreController.java

@@ -144,7 +144,7 @@ public class CmPageCentreController extends BaseController {
         return map;
     }
 
-    @RequiresPermissions("cmpage:cmPageBigTopicFloor:edit")
+    @RequiresPermissions("cmpage:cmPageCentre:edit")
     @ResponseBody
     @RequestMapping(value = "updateCrmEnabledStatusByIds")
     public Map<String, Object> updateCrmEnabledStatusByIds(String crmEnabledStatus, String[] ids, String[] supplierIDs, HttpServletRequest request, HttpServletResponse response) {

src/main/java/com/caimei/modules/cmpage/web/CmPageController.java

@@ -234,6 +234,8 @@ public class CmPageController extends BaseController {
         }
         //清除活动专题缓存
         redisService.removePattern("getPageFloorData*");
+        //清除云上美博会缓存
+        redisService.removePattern("activityData*");
         //清除产品仪器缓存
         redisService.removePattern("instrumentData*");
         redisService.removePattern("insCommodityData*");