Merge branch 'div_12'

yujian

2019-05-14 ad9fbd2c18f280ef9bba47f28353d367cf2d94e8

 fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsClassAdminCotroller.java

@@ -96,6 +96,8 @@
   @RequestMapping(value = "save")

   public void save(String callback, GoodsClass goodsClass, String jumpType, HttpServletRequest request,

         PrintWriter out) {

      if (goodsClass.getTaobaoCids() != null)

         goodsClass.setTaobaoCids(goodsClass.getTaobaoCids().replace("，", ","));

      try {

         // 1. 先判断httpRequest 是否含有文件类型

         if (request instanceof MultipartHttpServletRequest) {