承运结算单优化-司机结算

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

@@ -761,7 +761,7 @@ public class SettlementOwnerServiceImpl  implements SettlementOwnerService {
         Integer invoicingCompanyId = null;
         //开票公司上报标识
         Integer reportFlag  = null ;
-        String tip = "结算单状态“待对账”且同一货主，同一开票标识，同一结算方式，同一开票公司，同一上报标识 支持合并";
+        String tip = "结算单状态“待对账或待货主确认”且同一货主，同一开票标识，同一结算方式，同一开票公司，同一上报标识 支持合并";
         SettlementOwner merge = null;
         String settlementNo = settlementMqHandlerService.settlementNoGenerate();