Merge branch 'saff_update_feature' of E:\NowCodes\XXProjectCode\xxWorkSpace with conflicts.

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppShareholderDetailBiz.java

@@ -3,20 +3,13 @@ package com.github.wxiaoqi.security.admin.biz;
 import com.github.wxiaoqi.security.admin.entity.AppShareholderDetail;
 import com.github.wxiaoqi.security.admin.mapper.AppShareholderDetailMapper;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 
-/**
- * @author zuoyihang
- * @version 1.0
- * @description
- * @data 2019/12/21 19:52
- */
-@Transactional(rollbackFor = Exception.class)
-@Service
 public class AppShareholderDetailBiz extends BaseBiz<AppShareholderDetailMapper, AppShareholderDetail> {
 
-    public Integer findShareholderByUserIdOrPhone(Integer userId, String phone) {
-        return  mapper.selectShareHolderByUserIdOrPhone(userId,phone);
+    public ObjectRestResponse add(AppShareholderDetail appShareholderDetail,Integer updUserId){
+
+
+
     }
 }