From 7e7f901b2172281dc294dfbc67e6ad00625f09f4 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 04 三月 2024 10:11:21 +0800
Subject: [PATCH] 合并代码
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ICoursePackageService.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ICoursePackageService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ICoursePackageService.java
index 088082a..ea68ee6 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ICoursePackageService.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ICoursePackageService.java
@@ -4,7 +4,9 @@
import com.dsh.course.feignClient.course.model.CoursePackageScheduling;
import com.dsh.course.feignClient.course.model.TCoursePackage;
import com.dsh.guns.modular.system.util.ResultUtil;
+import io.swagger.models.auth.In;
+import java.util.List;
import java.util.Map;
/**
@@ -24,7 +26,7 @@
* @param state
* @return
*/
- Page<Map<String, Object>> queryCoursePackageLists(String provinceCode, String cityCode, Integer coursePackageTypeId, Integer storeId, String name, Integer status, Integer state);
+ Page<Map<String, Object>> queryCoursePackageLists(String provinceCode, String cityCode, Integer coursePackageTypeId, List<Integer> storeId, String name, Integer status, Integer state);
/**
@@ -169,7 +171,7 @@
* @param coursePackagePaymentId
* @return
*/
- ResultUtil makeUpMissedLessons(Long coursePackagePaymentId);
+ ResultUtil makeUpMissedLessons(Integer coursePackagePaymentId);
/**
--
Gitblit v1.7.1