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

admin

2019-10-26 2e6880535bd72c908807fd4ca92edfd359e0bf0b

 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserInfoService.java

@@ -188,6 +188,6 @@
    * @param page

    * @param count

    */

   public List<UserInfo> getAutoExtractUserIds(int page, int count, BigDecimal minSurplus);

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



}