Merge branch 'feature-recommend3' into 'master'

异常处理

See merge request !3063

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/potential/adaptor/PotentialDataAdaptor.java

@@ -17,6 +17,7 @@ import org.springframework.stereotype.Component;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * Created by wangzubo on 2025/3/21.
@@ -260,7 +261,7 @@ public class PotentialDataAdaptor {
         if (reportType == null) {
             return new Pair<>("", "");
         }
-        if (StringUtils.isBlank(bizDate)) {
+        if (StringUtils.isBlank(bizDate) || Objects.equals(bizDate, "null")) {
             return new Pair<>("", "");
         }
         String endDate = bizDate;