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

admin

2020-05-18 f5444c6b777ba9f1e0825066e9d12fb9ce4f9f72

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderMapper.java

@@ -417,4 +417,10 @@
    */
   Long countOrderByUidAndSettled(@Param("uid") Long uid, @Param("payment") BigDecimal payment);
   
   /**
    * 获取最新的淘宝订单号
    * @return
    */
   String getNewestOrderNoByTaoBao();
	
}