更新！

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/payment/PayCallService.java

@@ -328,7 +328,7 @@ public class PayCallService extends SuperService {
      * @param paymentNo
      * @return
      */
-    public ResultContent unionFrictionlessPayFinish(String paymentNo, ResultContent<List<TransactionLogModel>> resultContent, String state) {
+    public ResultContent unionFrictionlessPayFinish(String paymentNo, com.github.microservice.pay.client.ret.ResultContent<List<TransactionLogModel>> resultContent, String state) {
         if (StringUtils.isEmpty(paymentNo)) {
             return ResultContent.buildFail("paymentNo为空");
         }
@@ -467,7 +467,7 @@ public class PayCallService extends SuperService {
      *                  "TRADE_REFUND 订单转入退货流程,退货可能是部分也可能是全部"
      * @return
      */
-    public ResultContent unionFrictionlessPayRefundFinish(String paymentNo, ResultContent<List<TransactionLogModel>> resultContent, String state) {
+    public ResultContent unionFrictionlessPayRefundFinish(String paymentNo, com.github.microservice.pay.client.ret.ResultContent<List<TransactionLogModel>> resultContent, String state) {
 
         return ResultContent.buildSuccess();
     }