xingzai 1 anno fa
parent
commit
abe6480677
1 ha cambiato i file con 4 aggiunte e 5 eliminazioni
  1. 4 5
      utils/constants.go

+ 4 - 5
utils/constants.go

@@ -212,13 +212,12 @@ const (
 	TPL_MSG                     = "tpl_msg"                     //王芳手机号地址参数
 	TPL_MSG_NEI_RONG_ZU         = "tpl_msg_nei_rong_zu"         //内容组四人
 )
-
 const (
-<<<<<<< HEAD
-	COLLECTIONS_INFO_HTTP_URL = "https://vmp.hzinsights.com/v2/collections" // 上海策略平台精选看板路由
-=======
 	MobileShenTao       = "18767183922" //沈涛手机号
 	MobileZhangChuanXin = "15557270714" // 张传星手机号
 	MobileWangFang      = "18621268829" // 王芳手机号
->>>>>>> fec6b44aacf712e65ebc6b1c721ae4d3c8792fb6
+)
+
+const (
+	COLLECTIONS_INFO_HTTP_URL = "https://vmp.hzinsights.com/v2/collections" // 上海策略平台精选看板路由
 )