Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev_temp

# Conflicts:
#	epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aspect/BaseRequestLogAspect.java

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aspect/BaseRequestLogAspect.java

@@ -63,7 +63,7 @@ public abstract class BaseRequestLogAspect {
 
         try {
             Object[] args = point.getArgs();
-            ThreadLocalConstant.requestParam.set(JSON.toJSONString(args));
+            ThreadLocalConstant.requestParam.set(objectsToString(args));
             log.info(">>>>>>>>请求信息>>>>>>>>:事务流水号:{},url:{} ,method:{},请求参数:{}", transactionSerial, requestURI, method, objectsToString(args));
             result = point.proceed();
             resultInfoLog(transactionSerial, getExecPeriod(startTime), result);