Merge branch 'master_develop' into div_develop

yujian

2019-05-13 f6ce3fd74c60cb204372b01bc68467c0ed180da7

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

@@ -49,6 +49,9 @@
   @RequestMapping(value = "save")

   public void save(String callback, GoodsSubClass goodsSubClass, Long pid, Integer type, HttpServletRequest request,

         PrintWriter out) {

      if (goodsSubClass.getTaobaoCids() != null)

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



      try {

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

         if (request instanceof MultipartHttpServletRequest) {