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

admin

2020-04-10 1193f141ae9499d2446aa99e9c4fdc75e7552b7d

 fanli/src/main/java/com/yeshi/fanli/service/inter/order/OrderMoneySettleService.java

@@ -38,7 +38,7 @@
    * @param orderId

    * @param sourceType

    */

   public void ziGouSettle(String orderId, int sourceType,String taskKey) throws OrderMoneySettleException;

   public void ziGouSettle(String orderId, int sourceType, String taskKey) throws OrderMoneySettleException;



   /**

    * 邀请补贴结算

@@ -47,4 +47,5 @@
    * @throws OrderMoneySettleException

    */

   public void inviteSubsidySettle(Long uid, String taskKey) throws OrderMoneySettleException;



}