Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-11-04 148af6b2f57be264c84d0991237fbd7ddea491a4

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

@@ -321,11 +321,11 @@
   public CommonOrderVO firstValidOrderByUidAndType(Long uid, Integer type);



   /**

    * 查询是否本月到账订单

    * 查询是否上月到账订单

    * @param uid

    * @param type 类型： 1自购  2分享 3邀请

    * @return

    */

   public CommonOrderVO firstValidOrderTheMonthByUidAndType(Long uid, Integer type);

   public CommonOrderVO firstValidOrderLastMonthByUidAndType(Long uid, Integer type);



}