From 38cf88aad29f2ab98564311472b7e2bfda59cd39 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期三, 28 九月 2022 13:42:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventApi.java | 11 +++--------
1 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventApi.java
index 7a4c003..bb4be05 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventApi.java
@@ -47,8 +47,10 @@
@GetMapping("/appletsList")
public R appletList(){
- return R.ok(commediateTypeService.list(new QueryWrapper<ComMediateType>().eq("enabled",1)));
+ return R.ok(commediateTypeService.list(new QueryWrapper<ComMediateType>().eq("enabled",1).eq("delete_flag", 0)));
}
+
+
/**
* 新增事件类型
@@ -80,11 +82,4 @@
return R.ok(commediateTypeService.updateById(comMediateType));
}
- /**
- * 大屏接口-事件统计
- * */
- @PostMapping("/indexDate")
- public R indexDate(@RequestBody IndexDateDTO indexDateDTO){
- return commediateTypeService.indexDate(indexDateDTO);
- }
}
--
Gitblit v1.7.1