Merge remote-tracking branch 'origin/master' into master_develop

yujian

2019-05-05 b63c28a0c24782753eae26892171dd1a0c8d1fe7

 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;



}