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

yujian

2020-05-12 eff294ec92d77f0e1cbb65702d534bbe6813c0ee

 fanli/src/main/java/com/yeshi/fanli/service/inter/brand/BrandInfoRecordService.java

@@ -38,6 +38,6 @@
    * @param uid

    * @param device

    */

   public void deleteRecord(List<Long> list, Long uid, String device);

   public void deleteRecord(List<String> list, Long uid, String device);

   

}