Merge branch 'dev1'

Administrator

2018-11-27 acd2b6eaf5ebd1a9d5aa1f54a741dfa6fc52ac10

 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("修改成功"));