Merge branch 'div_10'

yujian

2019-05-14 efa2645b74ebfadc43ebe448370adb22aecc1ad7

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

@@ -7,7 +7,6 @@


import com.yeshi.fanli.entity.accept.AcceptData;

import com.yeshi.fanli.entity.bus.clazz.GoodsSubClass;

import com.yeshi.fanli.entity.bus.clazz.GoodsSubClassLabelMap;

import com.yeshi.fanli.exception.GoodsSubClassException;





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

    * @throws Exception

    */

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

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

         throws GoodsSubClassException, Exception;



}