~标签AR与非AR去重逻辑调整;

~config.opt;

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) {

liquidnet-bus-config/liquidnet-config/liquidnet-service-adam-test.yml

@@ -28,4 +28,4 @@ liquidnet:
       enters: 12
       enters_opr: 20
 
-#以下为spring各环境个性配置
+#以下为spring各环境个性配置
\ No newline at end of file

liquidnet-bus-do/liquidnet-service-goblin-do/src/main/java/com/liquidnet/service/goblin/entity/GoblinSelfTag.java

@@ -44,7 +44,7 @@ public class GoblinSelfTag implements Serializable {
     private String tagPic;
 
     /**
-     * 标签类型[1-音乐人|2-艺术家|3-品牌方|4-厂牌]
+     * 标签类型[1-音乐人|2-艺术家|3-品牌方|4-厂牌|5-AR]
      */
     private String tagType;