From 522315ae42936583042fc08aabda7e3c9e7a7b5d Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期二, 12 五月 2020 15:37:32 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div --- fanli/src/main/java/com/yeshi/fanli/service/inter/homemodule/SpecialService.java | 6 ++++-- 1 files changed, 4 insertions(+), 2 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..b0f6d19 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 @@ -6,7 +6,9 @@ import com.yeshi.fanli.entity.accept.AcceptData; import com.yeshi.fanli.entity.bus.homemodule.Special; +import com.yeshi.fanli.entity.bus.homemodule.SpecialExtra; 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); @@ -70,7 +72,7 @@ * @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, SpecialExtra extra) throws SpecialException, Exception; /** * 鏇存崲椤哄簭 -- Gitblit v1.8.0