From 3fe2aea7827eafc7513159db9a337fdf567584c8 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期一, 08 五月 2023 01:21:13 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 service-common/src/main/java/com/java110/common/smo/impl/MachineTypeV1InnerServiceSMOImpl.java |   16 +++++++---------
 1 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/service-common/src/main/java/com/java110/common/smo/impl/MachineTypeV1InnerServiceSMOImpl.java b/service-common/src/main/java/com/java110/common/smo/impl/MachineTypeV1InnerServiceSMOImpl.java
index b532332..9ce37e5 100644
--- a/service-common/src/main/java/com/java110/common/smo/impl/MachineTypeV1InnerServiceSMOImpl.java
+++ b/service-common/src/main/java/com/java110/common/smo/impl/MachineTypeV1InnerServiceSMOImpl.java
@@ -18,17 +18,15 @@
 
 import com.java110.common.dao.IMachineTypeV1ServiceDao;
 import com.java110.intf.common.IMachineTypeV1InnerServiceSMO;
-import com.java110.dto.machineType.MachineTypeDto;
+import com.java110.dto.machine.MachineTypeDto;
 import com.java110.po.machineType.MachineTypePo;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.core.base.smo.BaseServiceSMO;
-import com.java110.dto.user.UserDto;
 import com.java110.dto.PageDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -48,21 +46,21 @@
 
     @Override
     public int saveMachineType(@RequestBody  MachineTypePo machineTypePo) {
-        int saveFlag = machineTypeV1ServiceDaoImpl.saveMachineTypeInfo(BeanConvertUtil.beanCovertMap(machineTypePo));
+        int saveFlag = machineTypeV1ServiceDaoImpl.saveMachineTypeInfoSelective(BeanConvertUtil.beanCovertMap(machineTypePo));
         return saveFlag;
     }
 
-     @Override
+    @Override
     public int updateMachineType(@RequestBody  MachineTypePo machineTypePo) {
         int saveFlag = machineTypeV1ServiceDaoImpl.updateMachineTypeInfo(BeanConvertUtil.beanCovertMap(machineTypePo));
         return saveFlag;
     }
 
-     @Override
+    @Override
     public int deleteMachineType(@RequestBody  MachineTypePo machineTypePo) {
-       machineTypePo.setStatusCd("1");
-       int saveFlag = machineTypeV1ServiceDaoImpl.updateMachineTypeInfo(BeanConvertUtil.beanCovertMap(machineTypePo));
-       return saveFlag;
+        machineTypePo.setStatusCd("1");
+        int saveFlag = machineTypeV1ServiceDaoImpl.updateMachineTypeInfo(BeanConvertUtil.beanCovertMap(machineTypePo));
+        return saveFlag;
     }
 
     @Override

--
Gitblit v1.8.0