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

admin

2019-11-06 4d7db6fd66f5b2c9cae9954e46314f9711ce1e8f

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/shop/BanLiShopOrderMapper.java

@@ -31,5 +31,12 @@
    * @return
    */
   long countByUid(@Param("stateList") List<Integer> stateList, @Param("uid") Long uid);
	
   /**
    * 根据订单号查询
    * @param orderNo
    * @return
    */
   BanLiShopOrder selectByOrderNo(String orderNo);

}