Merge branch 'developer' into 'master'

feat:下载格式类型null

See merge request !54

gic-cloud-data-hook-service/src/main/java/com/gic/cloud/data/hook/service/entity/CsvResultSetHelper.java

@@ -213,7 +213,11 @@ public class CsvResultSetHelper implements ResultSetHelper {
 							result.add(resultSet.getTimestamp(i+1) != null ? timeFormatter_threadLocal.get().format(resultSet.getTimestamp(i+1)) : "");
 							break;
 						default:
-							String s2 = String.valueOf(resultSet.getObject(i + 1));
+							Object val = resultSet.getObject(i + 1);
+							String s2="";
+							if (val != null) {
+								s2 = String.valueOf(val);
+							}
 //							if(org.apache.commons.lang3.StringUtils.isNotBlank(s2)){
 //								if(s2.contains("E0") || s2.startsWith("0")){
 //									s2 = s2 + "\t";