xzzn/emsback
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source 
# Conflicts:
#	ems-system/src/main/java/com/xzzn/ems/service/impl/DeviceDataProcessServiceImpl.java
#	ems-system/src/main/java/com/xzzn/ems/service/impl/GeneralQueryServiceImpl.java
This commit is contained in:
dashixiong
2026-02-12 21:06:36 +08:00
parent 63ed2641ee 6545b4f947
commit 66de6fe77c
23 changed files with 836 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ems-common/src/main/java/com/xzzn/common/utils/StringUtils.java
View File

@ -1,5 +1,8 @@
package com.xzzn.common.utils;
import com.xzzn.common.constant.Constants;
import com.xzzn.common.core.text.StrFormatter;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Collection;
@ -7,9 +10,8 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import org.springframework.util.AntPathMatcher;
import com.xzzn.common.constant.Constants;
import com.xzzn.common.core.text.StrFormatter;
/**
* 字符串工具类
@ -743,6 +745,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
}
public static String getString(Object s){
if (s == null) return null;
String result;
try {
result = String.valueOf(s);