Merge remote-tracking branch 'origin/v8.6_small_version_fix_20231218' into test

performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementOwnerServiceImpl.java

@@ -607,7 +607,7 @@ public class SettlementOwnerServiceImpl  implements SettlementOwnerService {
                 merge = item;
                 merge.setId(null);
                 merge.setId(null);
-                merge.setOrderNo(null);
+                merge.setOrderNo("");
                 merge.setSettlementNo(settlementNo);
                 merge.setSettlementSubNo(null);
                 merge.setMergedBy(loginUserInfo.getUserName());