Merge branch 'feature-2024-08-喜好洞察优化' into 'developer'

企微概览添加字段：去重的企微好友总数

See merge request !2141

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

@@ -180,6 +180,8 @@ public class WechatWorkOverviewController extends NewBaseController {
 
 
         if (isTotalQuery) {
+            indexList.add("企微好友总数（去重）");
+            fieldList.add("newEntwchFdNum");
             indexList.add("企微好友总数");
             fieldList.add("entwchFdNumTotal");
             indexList.add("已注册会员好友数");

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/wechatwork/WechatWorkOverviewStoreGroupVO.java

@@ -40,4 +40,9 @@ public class WechatWorkOverviewStoreGroupVO extends StoreGroupCommonVO implement
      * 未注册微信好友数
      */
     private Integer entwchFdNumNonmbr;
+
+    /**
+     * 微信好友总数（去重）
+     */
+    private Integer newEntwchFdNum;
 }