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

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

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

@@ -59,7 +59,7 @@
    * @param orderNo

    * @throws PreviewInfoException

    */

   public String saveMoneyArrival(Long uid, BigDecimal money, String time, String orderNo) throws PreviewInfoException;

   public String saveMoneyArrival(Long uid, BigDecimal money, String time, String orderNo, String platform) throws PreviewInfoException, Exception;



   public void saveMoneyInfo(Long uid, MoneyStatisticVO vo) throws PreviewInfoException;



@@ -77,4 +77,5 @@
    * @throws PreviewInfoException

    */

   public void previewExtractRecord(Long uid) throws PreviewInfoException;



}