From 97a69a6c2f2b60d0413f2cde4a7ba3139dbf426e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E9=87=91=E9=B9=8F?= <daofugui@163.com>
Date: Thu, 5 Sep 2019 18:37:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/EventCategoryController.java   |  6 ++++
 .../events/entity/EpdcEventsEntity.java       | 29 +------------------
 2 files changed, 7 insertions(+), 28 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/controller/EventCategoryController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/controller/EventCategoryController.java
index 9e39e9b8b..6e0750ef9 100755
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/controller/EventCategoryController.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/controller/EventCategoryController.java
@@ -62,6 +62,12 @@ public class EventCategoryController {
         return new Result<EventCategoryDTO>().ok(data);
     }
 
+    @GetMapping("list")
+    public Result<List<EventCategoryDTO>> list(@RequestParam Map<String, Object> params){
+        List<EventCategoryDTO> list = eventCategoryService.list(params);
+        return new Result<List<EventCategoryDTO>>().ok(list);
+    }
+
     @PostMapping
     public Result save(@RequestBody EventCategoryDTO dto){
         //效验数据
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/entity/EpdcEventsEntity.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/entity/EpdcEventsEntity.java
index 5021fc817..10027204f 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/entity/EpdcEventsEntity.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/entity/EpdcEventsEntity.java
@@ -42,10 +42,6 @@ import java.util.Date;
 public class EpdcEventsEntity extends BaseEpdcEntity {
 	private static final long serialVersionUID = 1L;
 
-    /**
-     * ID
-     */
-	private String id;
     /**
      * 用户ID
      */
@@ -138,28 +134,5 @@ public class EpdcEventsEntity extends BaseEpdcEntity {
 	 * 浏览数
 	 */
 	private Integer browseNum;
-    /**
-     * 删除标识 0：未删除，1：已删除
-     */
-	private String delFlag;
-    /**
-     * 乐观锁
-     */
-	private Integer revision;
-    /**
-     * 创建人
-     */
-	private String createdBy;
-    /**
-     * 创建时间
-     */
-	private Date createdTime;
-    /**
-     * 更新人
-     */
-	private String updatedBy;
-    /**
-     * 更新时间
-     */
-	private Date updatedTime;
+
 }