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

admin

2020-06-30 70e22f5f9c51a24452a877489a49c2d800b399eb

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

   

}