Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yj

2020-03-04 b416c2ffd263ca9d191fc1109bd72d10f8c5176d

 fanli/src/main/java/com/yeshi/fanli/service/inter/user/integral/IntegralExchangeService.java

@@ -7,6 +7,13 @@
import com.yeshi.fanli.vo.integral.ExchangeTipVO;



public interface IntegralExchangeService {

	
   /**

    * 根据主键查询

    * @param id

    * @return

    */

   public IntegralExchange selectByPrimaryKey(Long id);



   /**

    * 查询有效的