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

admin

2020-05-19 5647d090f7b83f406abfc390294162bbc6d68fcb

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

@@ -434,4 +434,10 @@
    */
   public long countOrderByUidAndSettled(Long uid, BigDecimal payment);

   /**
    * 获取最新的淘宝订单号
    * @return
    */
   public String getNewestOrderNoByTaoBao();

}