Merge remote-tracking branch 'origin/master' into master_develop

yujian

2019-05-05 b63c28a0c24782753eae26892171dd1a0c8d1fe7

 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();