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

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/goblin/GoblinSelfExtagAdminController.java

@@ -109,6 +109,8 @@ public class GoblinSelfExtagAdminController extends BaseController {
         queryWrapper.eq(GoblinSelfTag::getTagBelong, "1");
         if ("5".equals(tagType)) {// AR标签类型时，类型内标签名重复校验
             queryWrapper.eq(GoblinSelfTag::getTagType, tagType);
+        } else {
+            queryWrapper.ne(GoblinSelfTag::getTagType, "5");
         }
         queryWrapper.eq(GoblinSelfTag::getTagName, tagName.trim());
         if (goblinSelfTagService.count(queryWrapper) > 0) {