Merge branch 'div_develop' into master_develop

yujian

2019-04-29 9a24f2802a3d6fe3e82c05e52f2880d65ad04dcf

 fanli/src/main/java/com/yeshi/fanli/service/impl/goods/GoodsSubClassServiceImpl.java

@@ -147,6 +147,8 @@
         record.setSearchJson(null);

      } else if (!StringUtil.isJson(params)) {

         throw new GoodsSubClassException(1, "筛选条件非JSON格式");

      } else {

         record.setSearchJson(params);

      }

      

      Long id = record.getId();