Merge branch 'dev_jzg_lipf_v20260622'

partner/src/main/resources/logback-spring.xml

@@ -21,7 +21,6 @@
         <graylogPort>12201</graylogPort>
         <includeMdcData>true</includeMdcData>
         <extractStackTrace>true</extractStackTrace>
-        140430201005140048
     </appender>
 
     <root level="INFO">

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/aop/OrderOperationLogAspect.java

@@ -293,8 +293,8 @@ public class OrderOperationLogAspect {
             logger.info("oldItem=[{}]", JSONUtil.toJsonStr(oldItems));
             logger.info("newItem=[{}]", JSONUtil.toJsonStr(newItems));
 
-            track.setChangeBefore(String.join("\r\n", oldItems));
-            track.setChangeAfter(String.join("\r\n", newItems));
+            track.setChangeBefore(String.join("\n", oldItems));
+            track.setChangeAfter(String.join("\n", newItems));
         }
 
         track.setOrderNo(orderNo);

tenant/organization/src/main/java/com/jzg/organization/aop/OrderOperationLogAspect.java

@@ -169,8 +169,8 @@ public class OrderOperationLogAspect {
                 logger.info("oldItem=[{}]", JSONUtil.toJsonStr(oldItems));
                 logger.info("newItem=[{}]", JSONUtil.toJsonStr(newItems));
 
-                track.setChangeBefore(String.join("\r\n", oldItems));
-                track.setChangeAfter(String.join("\r\n", newItems));
+                track.setChangeBefore(String.join("\n", oldItems));
+                track.setChangeAfter(String.join("\n", newItems));
             }
             track.setResult(JSONUtil.toJsonStr(result));
             InsOrders insOrders = insOrdersClient.getById(orderNo);