From db3376279794f2216be07cc2bb298c9a2faf33e6 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期一, 31 五月 2021 18:16:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_future_wangge' into test_future_wangge
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridMemberRelationServiceImpl.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridMemberRelationServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridMemberRelationServiceImpl.java
index c078b84..ff56e6c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridMemberRelationServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridMemberRelationServiceImpl.java
@@ -3,9 +3,9 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.panzhihua.common.model.dtos.grid.EventGridMemberRelationAddDTO;
+import com.panzhihua.common.model.dtos.grid.EventGridMemberAddDTO;
+import com.panzhihua.common.model.dtos.grid.EventGridMemberEditDTO;
import com.panzhihua.common.model.dtos.grid.EventGridMemberRelationDeleteDTO;
-import com.panzhihua.common.model.dtos.grid.EventGridMemberRelationEditDTO;
import com.panzhihua.common.model.dtos.grid.PageEventGridMemberRelationDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.EventGridMemberRelationDetailsVO;
@@ -33,12 +33,12 @@
private EventGridMemberRelationMapper eventGridMemberRelationMapper;
/**
* 新增网格和网格员的关联关系
- * @param eventGridMemberRelationAddDTO
+ * @param eventGridMemberAddDTO
* @return 新增结果
*/
- public R add(EventGridMemberRelationAddDTO eventGridMemberRelationAddDTO){
+ public R add(EventGridMemberAddDTO eventGridMemberAddDTO){
EventGridMemberRelationDO eventGridMemberRelationDO = new EventGridMemberRelationDO();
- BeanUtils.copyProperties(eventGridMemberRelationAddDTO, eventGridMemberRelationDO);
+ BeanUtils.copyProperties(eventGridMemberAddDTO, eventGridMemberRelationDO);
eventGridMemberRelationDO.setCreateAt(new Date());
if(eventGridMemberRelationMapper.insert(eventGridMemberRelationDO)>0){
return R.ok();
@@ -48,12 +48,12 @@
/**
* 修改网格和网格员的关联关系
- * @param eventGridMemberRelationEditDTO
+ * @param eventGridMemberEditDTO
* @return 维护结果
*/
- public R edit(EventGridMemberRelationEditDTO eventGridMemberRelationEditDTO){
+ public R edit(EventGridMemberEditDTO eventGridMemberEditDTO){
EventGridMemberRelationDO eventGridMemberRelationDO = new EventGridMemberRelationDO();
- BeanUtils.copyProperties(eventGridMemberRelationEditDTO, eventGridMemberRelationDO);
+ BeanUtils.copyProperties(eventGridMemberEditDTO, eventGridMemberRelationDO);
//eventGridMemberRelationDO.setUpdateAt(new Date());
if(eventGridMemberRelationMapper.updateById(eventGridMemberRelationDO)>0){
return R.ok();
--
Gitblit v1.7.1