Merge branch 'v17.5_order_child_sync_broker_20240617' into test

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

@@ -392,9 +392,8 @@ public class PaymentServiceImpl implements PaymentService {
     }
 
 
-
     @Override
-    public void updateOrderPaymentStatusById(String id,Integer status) {
+    public void updateOrderPaymentStatusById(String id,int status) {
         //查询冻结记录
         OrderPayment orderPaymentOptional = orderPaymentDao.getEntityByKey(Integer.valueOf(id)).orNull();
         if (null == orderPaymentOptional){