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

yujian

2019-11-07 64a1ca289eda4deb422549311c4539b09fd30ba3

 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);

}