From b64dfe0172b04830bd16c3aa5757fa87d291057f Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期四, 01 四月 2021 09:16:29 +0800
Subject: [PATCH] 合并代码 并且解决冲突
---
service-api/src/main/java/com/java110/api/bmo/parkingSpace/impl/ParkingSpaceBMOImpl.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/bmo/parkingSpace/impl/ParkingSpaceBMOImpl.java b/service-api/src/main/java/com/java110/api/bmo/parkingSpace/impl/ParkingSpaceBMOImpl.java
index 9ec2c8e..bb15fb4 100644
--- a/service-api/src/main/java/com/java110/api/bmo/parkingSpace/impl/ParkingSpaceBMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/bmo/parkingSpace/impl/ParkingSpaceBMOImpl.java
@@ -88,7 +88,8 @@
businessParkingSpace.putAll(paramInJson);
businessParkingSpace.put("state", parkingSpaceDto.getState());
ParkingSpacePo parkingSpacePo = BeanConvertUtil.covertBean(businessParkingSpace, ParkingSpacePo.class);
- parkingSpaceInnerServiceSMOImpl.updateParkingSpace(parkingSpacePo);
+ //parkingSpaceInnerServiceSMOImpl.updateParkingSpace(parkingSpacePo);
+ super.update(dataFlowContext, parkingSpacePo, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_PARKING_SPACE);
}
/**
@@ -196,7 +197,9 @@
businessParkingSpace.put("bId", "-1");
businessParkingSpace.put("createTime", new Date());
ParkingSpacePo parkingSpacePo = BeanConvertUtil.covertBean(businessParkingSpace, ParkingSpacePo.class);
- parkingSpaceInnerServiceSMOImpl.saveParkingSpace(parkingSpacePo);
+ super.insert(dataFlowContext, parkingSpacePo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_PARKING_SPACE);
+
+ //parkingSpaceInnerServiceSMOImpl.saveParkingSpace(parkingSpacePo);
}
--
Gitblit v1.8.0