Merge remote-tracking branch 'origin/master'

admin

2019-04-12 c389b1ca090df256bad7fd0d183914146c1f93b8

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

@@ -62,12 +62,4 @@
    */

   public Map<String, Object> lastMonthSettleOrderNumber(Long uid);



   /**

    *   是否产生订单：自购、分享有效订单数量

    * @param uid

    * @return

    */

   public boolean hasRebateAndShareOrder(Long uid);





}