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

admin

2019-10-29 54ae34b91644b02c422b41197ae6ce33f4e3ca57

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoServiceImpl.java

@@ -649,5 +649,11 @@
      userInfo.setNickName(nickName);

      userInfoMapper.updateByPrimaryKeySelective(userInfo);

   }

	
	
   @Override

   public List<UserInfo> getAutoExtractUser(int start, int count, BigDecimal minSurplus, String beganDate,String endDate) {

      return userInfoMapper.getAutoExtractUser(start, count, minSurplus, beganDate, endDate);

   }



}