Merge remote-tracking branch 'origin/master'

admin

2019-06-27 ab9e60fa9a8e43d797446730a5dc9ebfb6b3f4e6

 fanli/src/main/java/com/yeshi/fanli/service/inter/goods/GoodsSubClassService.java

@@ -123,7 +123,7 @@
    * @throws GoodsSubClassException

    * @throws Exception

    */

   public void saveObject(MultipartFile file, GoodsSubClass record, Integer type, Long pid)

   public void saveObject(MultipartFile file,MultipartFile file2,  GoodsSubClass record, Integer type, Long pid,Long labelId)

         throws GoodsSubClassException, Exception;



}