From ef57094e91072ebe05bb3781e028d6d7ad8a0c45 Mon Sep 17 00:00:00 2001
From: heheng <heheng@123456>
Date: 星期一, 17 二月 2025 11:15:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-20250116' into dev-20250116

---
 exam-system/src/main/java/com/gkhy/exam/pay/service/CoalPayService.java |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/exam-system/src/main/java/com/gkhy/exam/pay/service/CoalPayService.java b/exam-system/src/main/java/com/gkhy/exam/pay/service/CoalPayService.java
index 74d3a12..c49350e 100644
--- a/exam-system/src/main/java/com/gkhy/exam/pay/service/CoalPayService.java
+++ b/exam-system/src/main/java/com/gkhy/exam/pay/service/CoalPayService.java
@@ -1,16 +1,16 @@
 package com.gkhy.exam.pay.service;
 
+import cn.com.jit.new_vstk.Bean.SignResult;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.gkhy.exam.pay.dto.rep.CoalPayRepDto;
 import com.gkhy.exam.pay.dto.rep.CoalPayStudentRep;
-import com.gkhy.exam.pay.dto.req.CoalPayDto;
-import com.gkhy.exam.pay.dto.req.CoalPayReq;
-import com.gkhy.exam.pay.dto.req.CoalPayStudentReq;
-import com.gkhy.exam.pay.dto.req.CoalPayTypeReq;
+import com.gkhy.exam.pay.dto.req.*;
 import com.gkhy.exam.pay.entity.CoalPay;
 import com.gkhy.exam.pay.entity.CoalPayStudent;
+import com.gkhy.exam.pay.utils.ResultVo;
 import com.ruoyi.common.core.domain.AjaxResult;
 
+import java.io.IOException;
 import java.util.List;
 
 public interface CoalPayService extends IService<CoalPay> {
@@ -29,4 +29,8 @@
     int updateCoalPayType(CoalPayTypeReq coalPayDto);
 
     String personPayMoney(Long coalPayId, Long studentId);
+
+    String teamPayMoney(CoalTeamPayReq coalTeamPayReq);
+
+    ResultVo topay() throws IOException;
 }

--
Gitblit v1.9.2