冲突文件

yujian

2019-07-10 aad0554cc7f18a6ec05e2e5e646b5e501d41617d

 fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SuperSpecialCardServiceImpl.java

@@ -8,15 +8,12 @@


import com.yeshi.fanli.dao.mybatis.homemodule.SuperSpecialCardMapper;

import com.yeshi.fanli.entity.bus.homemodule.SuperSpecialCard;

import com.yeshi.fanli.service.inter.config.SystemService;

import com.yeshi.fanli.service.inter.homemodule.SuperSpecialCardService;





@Service

public class SuperSpecialCardServiceImpl implements SuperSpecialCardService {

   

   @Resource

   private SystemService systemService;

   

   @Resource

   private SuperSpecialCardMapper superSpecialCardMapper;