From b64dfe0172b04830bd16c3aa5757fa87d291057f Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期四, 01 四月 2021 09:16:29 +0800
Subject: [PATCH] 合并代码 并且解决冲突
---
service-user/src/main/java/com/java110/user/smo/impl/UserAttrInnerServiceSMOImpl.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/smo/impl/UserAttrInnerServiceSMOImpl.java b/service-user/src/main/java/com/java110/user/smo/impl/UserAttrInnerServiceSMOImpl.java
index ce128c7..ee9a86d 100644
--- a/service-user/src/main/java/com/java110/user/smo/impl/UserAttrInnerServiceSMOImpl.java
+++ b/service-user/src/main/java/com/java110/user/smo/impl/UserAttrInnerServiceSMOImpl.java
@@ -7,6 +7,7 @@
import com.java110.dto.PageDto;
import com.java110.dto.user.UserAttrDto;
import com.java110.dto.user.UserDto;
+import com.java110.po.userAttr.UserAttrPo;
import com.java110.user.dao.IUserAttrServiceDao;
import com.java110.utils.util.BeanConvertUtil;
import org.springframework.beans.factory.annotation.Autowired;
@@ -94,6 +95,11 @@
return userAttrServiceDaoImpl.queryUserAttrsCount(BeanConvertUtil.beanCovertMap(userAttrDto));
}
+ @Override
+ public int saveUserAttr(@RequestBody UserAttrPo userAttrPo) {
+ return userAttrServiceDaoImpl.saveUserAttr(BeanConvertUtil.beanCovertMap(userAttrPo));
+ }
+
public IUserAttrServiceDao getUserAttrServiceDaoImpl() {
return userAttrServiceDaoImpl;
}
--
Gitblit v1.8.0