Merge remote-tracking branch 'origin/div' into div

admin

2019-09-09 61c21f17b1ad94e4b0018c7e385195bab21b0b5c

 fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralDetailServiceImpl.java

@@ -33,6 +33,12 @@
      integralDetailMapper.insertSelective(record);

   }

   

	
   @Override

   public IntegralDetail getDetailByUniqueKey(String uniqueKey) {

      return integralDetailMapper.getDetailByUniqueKey(uniqueKey);

   }

	


   @Override

   public List<IntegralDetailVO> listDetailForClient(Long uid, Long detailId, Date maxTime, Integer type) {