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

admin

2019-11-20 e33752e9f600e6e0cdb9c0119b5ea286be33162c

 fanli/src/main/java/com/yeshi/fanli/service/inter/money/extract/ExtractService.java

@@ -127,5 +127,12 @@
    * @throws ExtractException

    */

   public void updateManualExtractRecord(List<RedPackRecord> list) throws ExtractException;



   /**

    * 
    * @return

    * @throws Exception

    */

   public List<UserInfo> preAutoUser() throws Exception;

   

}