From aecc6316d0a6bcb3119dc062106deb5a57cdd790 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Tue, 25 May 2021 17:20:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-manage/src/main/java/com/moral/api/controller/OrganizationController.java | 15 +++------------
1 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/controller/OrganizationController.java b/screen-manage/src/main/java/com/moral/api/controller/OrganizationController.java
index fb183ff..8642de0 100644
--- a/screen-manage/src/main/java/com/moral/api/controller/OrganizationController.java
+++ b/screen-manage/src/main/java/com/moral/api/controller/OrganizationController.java
@@ -48,10 +48,7 @@
//������������������
OrganizationDTO dto = organizationService.insertOrganization(form);
- //���������������������������
- OrganizationInsertVO vo = OrganizationInsertVO.convert(dto);
-
- return new ResultMessage(dto.getCode(), dto.getMsg(), vo);
+ return new ResultMessage(dto.getCode(), dto.getMsg(), null);
}
@PostMapping("update")
@@ -71,10 +68,7 @@
//������������������
OrganizationDTO dto = organizationService.updateOrganization(form);
- //���������������������������
- OrganizationUpdateVO vo = OrganizationUpdateVO.convert(dto);
-
- return new ResultMessage(dto.getCode(), dto.getMsg(), vo);
+ return new ResultMessage(dto.getCode(), dto.getMsg(), null);
}
@PostMapping("delete")
@@ -87,10 +81,7 @@
//������������������
OrganizationDTO dto = organizationService.deleteOrganization(form);
- //���������������������������
- OrganizationDeleteVO vo = OrganizationDeleteVO.convert(dto);
-
- return new ResultMessage(dto.getCode(), dto.getMsg(), vo);
+ return new ResultMessage(dto.getCode(), dto.getMsg(), null);
}
@GetMapping("query")
--
Gitblit v1.8.0