冲突解决

admin

2019-01-03 e2cf92c43e6d7e274c565cebcef6c97efaf77870

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