Merge remote-tracking branch 'origin/1.1' into 1.1

puzhibing

2023-06-03 9c19d5222d91bb191808d868aa056bfedbacb0c9

 driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IOrderService.java

@@ -203,4 +203,7 @@
     * 主动完成线下收款
     */
    void completeCollection();


    ResultUtil fengzhang(Integer userType, Integer id, String merchantNumber, Long orderId, String merOrderId, Double amount, Integer sourceType);
}