Merge branch 'master' into div1

yujian

2018-12-29 2dff570ccfa532f8c012bc13829b302dd3e1b9d3

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

@@ -171,7 +171,8 @@
         

         subClass.setId(id);

         subClass.setUpdatetime(new Date());

			
         subClass.setAndroidClick(resultObj.getAndroidClick());

         subClass.setIosClick(resultObj.getIosClick());

         goodsSubClassService.updateByPrimaryKeySelective(subClass);

         

         JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("修改成功"));