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

admin

2019-09-20 db88b87df461820152d68d3d55a28f30c2da83e6

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/brand/TaoBaoShopHistoryMapper.java

@@ -15,7 +15,7 @@
    * @param uid
    * @return
    */
   void deleteByUid(@Param("shopId") Long shopId, @Param("uid") Long uid);
   void updateByUid(@Param("shopId") Long shopId, @Param("uid") Long uid);
   
   /**
    * 根据删除
@@ -23,7 +23,7 @@
    * @param device
    * @return
    */
   void deleteByDevice(@Param("shopId") Long shopId, @Param("device") String device);
   void updateByDevice(@Param("shopId") Long shopId, @Param("device") String device);