Merge remote-tracking branch 'origin/master'

admin

2019-05-22 9b4bf99c1a30f3a7c2bdd6faba7589ff4f7e48e5

 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)

         throws GoodsSubClassException, Exception;



}