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

admin

2019-08-26 6009c2c07cd32a76b32c8d63a5a017be695c5ea5

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

@@ -47,7 +47,7 @@
   public void removePicture(GoodsClass record) throws Exception;

   

   

   public List<GoodsClass> listquery() throws Exception;

   public List<GoodsClass> listquery(Integer sex) throws Exception;