Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/AppUserCollectDTO.java

@@ -2,11 +2,6 @@ package com.github.wxiaoqi.security.admin.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-
-import javax.persistence.Column;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
 import java.math.BigDecimal;
 
 /**
@@ -16,7 +11,6 @@ import java.math.BigDecimal;
 public class AppUserCollectDTO {
 
     @ApiModelProperty("主键id")
-    @GeneratedValue(generator = "JDBC")
     private Integer id;
 
     @ApiModelProperty("用户id")
@@ -40,6 +34,9 @@ public class AppUserCollectDTO {
     @ApiModelProperty("单位")
     private String unit;
 
+    @ApiModelProperty("是否取消；0-正常；1-取消")
+    private Integer status;
+
     @ApiModelProperty("是否删除；0-正常；1-删除")
     private Integer isDel;
 

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

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