Merge remote-tracking branch 'origin/dev-tiande' into dev-tiande

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserCollectBiz.java

@@ -80,7 +80,7 @@ public class AppUserCollectBiz extends BaseBiz<AppUserCollectMapper, AppUserColl
               }
           }
 
-        return  ObjectRestResponse.succ();
+        return  ObjectRestResponse.succ(collect.getId());
     }
 
     //更新收藏

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/AppUserCollectController.java

@@ -107,6 +107,7 @@ public class AppUserCollectController extends CommonBaseController {
     @RequestMapping(value = "/collect/remove",method = RequestMethod.POST)
     @ApiModelProperty("取消收藏")
     public ObjectRestResponse remove(@RequestBody AppUserCollectDTO collectDTO)throws Exception {
+        collectDTO.setStatus(1);
         return collectBiz.upUserCollect(collectDTO);
     }