From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期三, 20 五月 2020 17:25:08 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2 --- fanli/src/main/java/com/yeshi/fanli/service/inter/homemodule/SpecialService.java | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/homemodule/SpecialService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/homemodule/SpecialService.java index eead433..54390f7 100644 --- a/fanli/src/main/java/com/yeshi/fanli/service/inter/homemodule/SpecialService.java +++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/homemodule/SpecialService.java @@ -5,8 +5,10 @@ import org.springframework.web.multipart.MultipartFile; import com.yeshi.fanli.entity.accept.AcceptData; +import com.yeshi.fanli.entity.bus.homemodule.CommonShareInfo; import com.yeshi.fanli.entity.bus.homemodule.Special; import com.yeshi.fanli.exception.homemodule.SpecialException; +import com.yeshi.fanli.vo.homemodule.SpecialVO; import net.sf.json.JSONObject; @@ -22,7 +24,7 @@ public Special selectByPrimaryKey(Long id); - public List<Special> listQueryByCard(long start, int count, Long card, String key, Integer sex); + public List<SpecialVO> listQueryByCard(long start, int count, Long card, String key, Integer sex); public long countlistQueryByCard(Long card, String key, Integer sex); @@ -49,7 +51,7 @@ * @param systemId * @return */ - public List<Special> listBySystemAndCard(String card, Long systemId); + public List<SpecialVO> listBySystemAndCard(String card, Long systemId); /** * 娲诲姩鍒楄〃-鍒嗛〉 @@ -59,7 +61,7 @@ * @param systemId * @return */ - public List<Special> listPageBySystemAndCard(long start, int count, String card, Long systemId); + public List<SpecialVO> listPageBySystemAndCard(long start, int count, String card, Long systemId); /** @@ -70,7 +72,8 @@ * @throws SpecialException * @throws Exception */ - public void saveObject(MultipartFile file, MultipartFile file2, MultipartFile file3, Special record, String jumpType) throws SpecialException, Exception; + public void saveObject(MultipartFile file, MultipartFile file2, MultipartFile file3, Special record + , String jumpType, CommonShareInfo shareInfo) throws SpecialException, Exception; /** * 鏇存崲椤哄簭 @@ -107,7 +110,7 @@ * @param versionCode * @return */ - public List<Special> listByVersion(long start, int count, String card, String platform, Integer versionCode); + public List<SpecialVO> listByVersion(long start, int count, String card, String platform, Integer versionCode); /** @@ -130,7 +133,7 @@ * @param versionCode * @return */ - public List<Special> listByPlaceKeyHasLabel(long start, int count, List<String> list, Integer platform, Integer versionCode); + public List<SpecialVO> listByPlaceKeyHasLabel(long start, int count, List<String> list, Integer platform, Integer versionCode); /** -- Gitblit v1.8.0