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

admin

2019-11-29 32f8ab2806fb088335e24983477f5179064ada9d

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

@@ -666,4 +666,9 @@
      return userInfoMapper.countByType(type);

   }



   @Override

   public List<UserInfo> getAutoExtractUserTo1212(int start, int count) {

      return userInfoMapper.getAutoExtractUserTo1212(start, count);

   }



}