Merge branch 'dev' into 'mp-server-test'

标签删除

See merge request quanshu/mp-server!330

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/GoodsTagMgrController.java

@@ -154,11 +154,8 @@ public class GoodsTagMgrController extends BaseApiController {
         || 0 == goodsTag.getTagId()) {
       return error(ErrorCodeEnum.ERROR_CODE_1001);
     }
-    int cnt = goodsTagRelService.count(new LambdaQueryWrapper<GoodsTagRel>()
+    goodsTagRelService.remove(new LambdaQueryWrapper<GoodsTagRel>()
         .eq(GoodsTagRel::getTagId, goodsTag.getTagId()));
-    if (cnt > 0) {
-      return error(ErrorCodeEnum.ERROR_CODE_1025);
-    }
 
     boolean res = goodsTagService.removeById(goodsTag.getTagId());
     return res ? AjaxResult.success("删除成功") : AjaxResult.error("删除失败");