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

Feature 2024 08 喜好洞察优化

See merge request !2140

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/utils/data/StoreAuthUtils.java

@@ -53,7 +53,7 @@ public class StoreAuthUtils {
         jsonObject.put("wxEnterpriseId", login.getWxEnterpriseId());
     }
 
-    public <T> List<T> getOverview(String apolloKey, JSONObject jsonObject, StoreGroupCommonQO storeGroupCommonQO, Class clazz) {
+    public <T> List<T> getOverview(String apolloKey, JSONObject jsonObject, StoreGroupCommonQO storeGroupCommonQO, Class<T> clazz) {
         setCommonParam(jsonObject, storeGroupCommonQO);
         Map<String, Object> res = DataApiUtils.http(jsonObject.toJSONString(), apolloKey);
         List<JSONObject> list = DataApiUtils.getDataList(res);

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

@@ -29,6 +29,11 @@ public class WechatWorkOverviewVO implements Serializable {
     private Integer entwchFdNumNonmbr;
 
     /**
+     * 微信好友总数（去重）
+     */
+    private Integer newEntwchFdNum;
+
+    /**
      * 已注册微信好友数占比
      */
     private Double entwchFdNumMbrRate;