Merge branch 'saff_update_feature' into dev

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

@@ -170,7 +170,7 @@ public class AppShareholderDetailBiz extends BaseBiz<AppShareholderDetailMapper,
             boolean flag = true;
             for (AppShareholderDetailVo appShareholderDetailVoNew : AppShareholderDetailMerge) {
                 if (appShareholderDetailVoNew.getPhone().equals(appShareholderDetailVoOld.getPhone()) && appShareholderDetailVoNew.getIsQuit().equals(appShareholderDetailVoOld.getIsQuit())) {//判断姓名是否相同
-                    appShareholderDetailVoNew.setCompanyName(appShareholderDetailVoNew.getCompanyName() + "," + appShareholderDetailVoOld.getCompanyName());//姓名相同时，年龄相加
+                    appShareholderDetailVoNew.setCompanyName(appShareholderDetailVoNew.getCompanyName() + "," + appShareholderDetailVoOld.getCompanyName());
                     flag = false;
                 }
             }
@@ -178,11 +178,15 @@ public class AppShareholderDetailBiz extends BaseBiz<AppShareholderDetailMapper,
                 AppShareholderDetailMerge.add(appShareholderDetailVoOld);//给整合后集合添加子元素
             }
         }
-        dataVO.setPageSize(pageDataVO.getPageSize());
+        //  dataVO.setPageSize(pageDataVO.getPageSize());
+        dataVO.setPageSize(AppShareholderDetailMerge.size());
+
         dataVO.setPageNum(pageDataVO.getPageNum());
         dataVO.setData(AppShareholderDetailMerge);
+        dataVO.setTotalPage(AppShareholderDetailMerge.size());
+
         dataVO.setTotalCount(pageDataVO.getTotalCount());
-        dataVO.setTotalPage(pageDataVO.getTotalPage());
+        // dataVO.setTotalPage(pageDataVO.getTotalPage());
         return dataVO;
     }
 

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/admin/AppShareholderDetailController.java

@@ -67,6 +67,7 @@ public class AppShareholderDetailController {
     }
 
 
+
     /**
      * 新增或编辑身份信息
      *