Merge remote-tracking branch 'origin/feature/admin' into feature/admin

mcwl-admin/src/main/java/com/mcwl/web/controller/resource/ModelCommentController.java

@@ -43,8 +43,8 @@ public class ModelCommentController {
     @ApiOperation(value = "模型点赞/取消")
     @RepeatSubmit
     @GetMapping("/modelLike/{modelId}")
-    public AjaxResult like(@PathVariable Long imageId) {
-        modelLikeService.like(imageId);
+    public AjaxResult like(@PathVariable Long modelId) {
+        modelLikeService.like(modelId);
         return AjaxResult.success();
     }
 

mcwl-resource/src/main/resources/mapper/resource/ModelLikeMapper.xml

@@ -14,6 +14,7 @@
                update_by,
                update_time,
                del_flag,
-               remark where user_id = #{userId} and model_id = #{modelId}
+               remark
+                from model_like where user_id = #{userId} and model_id = #{modelId}
     </select>
 </mapper>