Merge remote-tracking branch 'origin/develop_3' into develop_3

adc-da-sys/src/main/java/com/adc/da/person/controller/PersonCollectEOController.java

@@ -77,11 +77,10 @@ public class PersonCollectEOController extends BaseController<TsPersonCollect> {
     @ApiOperation(value = "|PersonCollectEO|新增")
     @PostMapping(consumes = APPLICATION_JSON_UTF8_VALUE)
 //    @RequiresPermissions("person:personCollect:create")
-    public ResponseMessage<TsPersonCollect> create(@RequestBody TsPersonCollect tsPersonCollect,String userId) throws Exception {
+    public ResponseMessage<TsPersonCollect> create(@RequestBody TsPersonCollect tsPersonCollect) throws Exception {
     //    String userId = LoginUserUtil.getUserId();
 
         tsPersonCollect.setId(UUIDUtils.randomUUID20());
-        tsPersonCollect.setUserId(userId);
         tsPersonCollect.setValidFlag(0);
         tsPersonCollect.setCreationTime(new Date());
         tsPersonCollect.setModifyTime(new Date());
@@ -123,6 +122,13 @@ public class PersonCollectEOController extends BaseController<TsPersonCollect> {
      * @Param [personCollectEO]
      * @return com.adc.da.util.http.ResponseMessage<java.lang.Integer>
      **/
+
+    /**
+     * 通过收藏的id和userId确定修改的数据
+     * @param tsPersonCollect
+     * @return
+     * @throws Exception
+     */
     @ApiOperation(value = "取消收藏")
     @PutMapping("/updateByUserId")
 //    @RequiresPermissions("person:personCollect:updateByUserId") PersonCollectEO