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

src/main/java/com/sooka/sponest/event/centereventteventcatalogue/controller/CentereventTEventcatalogueController.java

@@ -308,13 +308,17 @@ public class CentereventTEventcatalogueController extends BaseController {
         return AjaxResult.success();
     }
 
+    /**
+     * 删除事件目录
+     */
+    @RequiresPermissions("eventcatalogue:eventcatalogue:remove")
+    @Log(title = "事件目录", businessType = BusinessType.DELETE)
     @DeleteMapping("/{eventCode}")
     public AjaxResult remove(@PathVariable String eventCode) {
         int result = centereventTEventcatalogueService.deleteCentereventTEventcatalogueByCode(eventCode);
         EventProducerUtil.publish(eventCode, BusinessType.DELETE);
         return toAjax(result);
     }
-
     @GetMapping("/upatach")
     public AjaxResult upatach() {
         Map<String, String> paramMap = SpringUtils.getBean(RemoteConfigService.class).remotegetConfigMap(Arrays.asList(FILE_PREFIX_LOCAL, FILE_PREFIX_HIK1, FILE_PREFIX_HIK2, FILE_PREFIX_DH1, FILE_PREFIX_DH2)).getData();
@@ -328,6 +332,7 @@ public class CentereventTEventcatalogueController extends BaseController {
         return AjaxResult.success();
     }
 
+
     /**
      * 手机端调用发送短信
      *