Merge branch 'div' into div-1

yujian

2020-03-28 393e3a365b5ebbed6e9eef07fbd18881cde73711

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

   

}