From c7dd4a195d8d893d92c49963447cdf6486844584 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 20 Oct 2023 09:45:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into cjl
---
screen-manage/src/main/java/com/moral/api/controller/SysDictController.java | 13 ++-----------
1 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/controller/SysDictController.java b/screen-manage/src/main/java/com/moral/api/controller/SysDictController.java
index f1e9d44..7c3731b 100644
--- a/screen-manage/src/main/java/com/moral/api/controller/SysDictController.java
+++ b/screen-manage/src/main/java/com/moral/api/controller/SysDictController.java
@@ -9,10 +9,7 @@
import com.moral.api.pojo.form.sysDictType.SysDictTypeDeleteForm;
import com.moral.api.pojo.form.sysDictType.SysDictTypeInsertForm;
import com.moral.api.pojo.form.sysDictType.SysDictTypeUpdateForm;
-import com.moral.api.pojo.vo.sysDictType.SysDictTypeDeleteVO;
-import com.moral.api.pojo.vo.sysDictType.SysDictTypeInsertVO;
import com.moral.api.pojo.vo.sysDictType.SysDictTypeQueryVO;
-import com.moral.api.pojo.vo.sysDictType.SysDictTypeUpdateVO;
import com.moral.api.service.SysDictDataService;
import com.moral.api.service.SysDictTypeService;
import com.moral.constant.ResponseCodeEnum;
@@ -132,10 +129,7 @@
//������������������
SysDictTypeDTO dto = sysDictTypeService.updateType(form);
- //������������������������
- SysDictTypeUpdateVO vo = SysDictTypeUpdateVO.convert(dto);
-
- return new ResultMessage(dto.getCode(), dto.getMsg(), vo);
+ return new ResultMessage(dto.getCode(), dto.getMsg(), null);
}
@PostMapping("type/delete")
@@ -148,10 +142,7 @@
//������������������
SysDictTypeDTO dto = sysDictTypeService.deleteType(form);
- //������������������������
- SysDictTypeDeleteVO vo = SysDictTypeDeleteVO.convert(dto);
-
- return new ResultMessage(dto.getCode(), dto.getMsg(), vo);
+ return new ResultMessage(dto.getCode(), dto.getMsg(),null);
}
}
--
Gitblit v1.8.0