Merge branch 'feature-2024-06-event-tracking' into 'developer'

好办小程序趋势接口调整

See merge request !1902

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/utils/eventtracking/DateExpandUtils.java

@@ -37,6 +37,7 @@ public class DateExpandUtils {
                 case 4:
                     JSONObject jsonObject = new JSONObject();
                     jsonObject.put("startDate", startDate);
+                    jsonObject.put("endDate", endDate);
                     jsonObject.put("pageNum", 1);
                     jsonObject.put("pageSize", 100);
                     Map<String, Object> res = DataApiUtils.http(jsonObject.toJSONString(), "data_pub_date_week");

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/eventtracking/TrendVO.java

@@ -11,7 +11,7 @@ import java.io.Serializable;
 @Data
 public class TrendVO implements Serializable {
 
-    private Long avgVisitTime;
+    private Integer avgVisitTime;
 
     /**
      * 员工总人数