Merge branch 'master' into 202411_fix_dup_code

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/HandoverOperationApiServiceImpl.java

@@ -330,6 +330,9 @@ public class HandoverOperationApiServiceImpl implements HandoverOperationApiServ
         retList.forEach(dto -> {
             TabHandoverTransfer mid = handoverTransferMap.get(dto.getStaffId());
             dto.setFriendCount(mid.getExternalCount());
+            if(null != mid.getUpdateTime()) {
+                dto.setUpdateTime(mid.getUpdateTime());
+            }
         });
 
         return retList;

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/WechatWorkController.java

@@ -378,6 +378,8 @@ public class WechatWorkController extends NewBaseController {
         fieldList.add("lastCsmeDate");
         indexList.add("删除时间");
         fieldList.add("deleteTime");
+        indexList.add("删除说明");
+        fieldList.add("delType");
 
 
         task.setFileName( "流失好友-流失明细-" + qo.getStartDate() + "_" + qo.getEndDate());

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/content/ContentCreativeController.java

@@ -262,8 +262,8 @@ public class ContentCreativeController {
         }
         result.setTotalCount(totalCount);
         result.setResult(list);
-        result.setCurrentPage(page.getCurrentPage());
-        result.setPageSize(page.getPageSize());
+        result.setCurrentPage(auditMaterialQO.getPageNum());
+        result.setPageSize(auditMaterialQO.getPageSize());
         if (!convs) {
             List<Long> materialIdList = list.stream().map(ContentMaterialVO::getContentMaterialId).collect(Collectors.toList());
             BasePageInfo pageInfo = new BasePageInfo();