diff --git a/platformapi/mtwmapi/retail_test.go b/platformapi/mtwmapi/retail_test.go
index c7d72575..ecfe6053 100644
--- a/platformapi/mtwmapi/retail_test.go
+++ b/platformapi/mtwmapi/retail_test.go
@@ -3,11 +3,7 @@ package mtwmapi
 import (
 	"errors"
 	"fmt"
-<<<<<<< HEAD
 	"git.rosy.net.cn/jx-callback/globals"
-=======
-	"git.rosy.net.cn/baseapi/utils/errlist"
->>>>>>> 85884e9932497f156e47da04db8229b88cf36e23
 	"testing"
 
 	"git.rosy.net.cn/baseapi/utils"
@@ -33,22 +29,21 @@ func TestRetailCatUpdate(t *testing.T) {
 	}
 }
 func TestRetailCatDelete(t *testing.T) {
-	var err error
-	errList := errlist.New()
-	info := []string{"11309161", "16227684", "7379027", "14422863", "16194618", "12405467", "12398353", "12422620", "12422751", "11437415", "2391979", "11037873", "11646173", "16126553", "12286931", "11086818", "9000444", "13413407", "10874383", "11674367", "11824223", "11939392", "11810047", "12071134", "16336571", "11799045", "12848707", "11596643", "14038247", "9676866", "15382980", "8967897", "11566485", "11774697", "11730687", "11798089", "11488932", "11651698", "11637939", "11831005", "11883106", "11011885", "11342761", "12131910", "12833849", "11209533", "16034387", "12211457", "11440630", "12665305", "11440628", "9578183", "11213162", "12665208", "13887316", "16218203"}
-	str := []string{"token_l69jtloeNOyfYoIv5vtAqA", "token_sPpMgp5WrqH--3oUPf5A2Q", "token_mqXPXS__T45VI3WK8iRGyA", "token_h_0MbgOUqP1zu1lQUoVLVA", "token_nRk9S74kkyAmJwnHUnNNTQ", "token_g04eYyajpFtB7z3ZIPhEgQ", "token_ji6aHTKAttUr5HpG-P1ILw", "token_iVA8HCqCw25WKAYAeoxI6w", "token_nZ7wvaGrgCKo_9eEGWpFhQ", "token_g0nXxm1y_b3WG-869uFHvQ", "token_mNksHDmG0qmuan9X2PNAXg", "token_nzqieSpknIntGYVnSctCyg", "token_jheBN1obUU6mCB6u93FBzA", "token_pCpFSUwf_57qrxGpXdNGWw", "token_rt3u9NYfIK5Fw7vCCjJI_A", "token_tcwAXxe5Y6vkZfWiV5pCVA", "token_gEUkpazta411uA4AoSNOzA", "token_ohaUdeTfmvdSD7UCNqNDXw", "token_nf9QokI2udnECY2s1zBIeA", "token_qSg63aT-Wt6BYgOO8r9MpQ", "token_jRfqTEHnchVH8-3SBzRD-Q", "token_hSw6aphyuATaU1524PpAog", "token_gpkQ3am3MIjtmL3WIp9LIQ", "token_v6p8GXKDXG64Mz9d6SlJ8g", "token_mVsCcR9Knd776UkwrqZCfg", "token_uN6yb9hg2L58Z_eI04hPZA", "token_smMsR19Ib6u5LEtkcpZIRw", "token_pJdrB68qBrJu_DAkEMNGow", "token_oE0SITdA7dSlT-yfVpdHqQ", "token_sT9UC1PA7yGF0i_ZN-9LKA", "token_ifEUVfiOnCWSkRH7uBpEKA", "token_lAH8mmNcd4FMrRNI4PhNgg", "token_r2KorM-YOndp3WD2icRNXA", "token_ukvP9JmDe8kzKvn2lP9HhA", "token_jN00JUjbTA7mHouHgHJD_w", "token_jF9quf44XfZLd89ew_xIDQ", "token_neBnndby2RbQ3YDmitxELw", "token_gOyTabNAYD_8kO7D3rJH4A", "token_nH7t8V0ib82ZMZyT0N1EzA", "token_mWp3EsfRBKnIZVIvq99Iww", "token_saH3wIiaXWHrEp1BYd9O5A", "token_g2RPkuiaJpB5FL93aSdL0Q", "token_pWOdbMFUxVw9rMKaeMRCAA", "token_hNc_xjRPdCiemK1YzwJBnQ", "token_kZj0G0WN5ggEbrBf-vtLSA", "token_jdfG0c3LmJL2_PZO8u1DTA", "token_r8Rll9OBeGP86Arp409AyQ", "token_kpxTu56s_wdcXbkvTOJIBA", "token_saPyD06boPCm9T7C2o9Htw", "token_uQQTtEL2oqlR5G5rQ_NHkQ", "token_k8JY5o5eR-GyxZTEH0pLBQ", "", "token_qNnnfVJweCf6Cv-wqNdJlg", "token_hVQ5K6FcX-gkRXVNLplPvA", "", "token_rq2dpLklomhaQA78qH1LMQ"}
-	for _, v := range info {
-		for _, i := range str {
-			err = New("5873", "41c479790a76f86326f89e8048964739", "", i).RetailCatDelete(v, "", "热销")
-			if err != nil {
-				errList.AddErr(err)
-			}
-		}
-	}
-	fmt.Printf("errList==============%s", errList)
+	//var err error
+	//errList := errlist.New()
+	//info := []string{"11309161", "7379027", "14422863", "12405467", "12398353", "12422620", "12422751", "11437415", "2391979", "11037873", "11646173", "12286931", "11086818", "9000444", "13413407", "10874383", "11674367", "11824223", "11939392", "11810047", "12071134", "11799045", "12848707", "11596643", "14038247", "9676866", "15382980", "8967897", "11566485", "11774697", "11730687", "11798089", "11488932", "11651698", "11637939", "11831005", "11883106", "11011885", "11342761", "12131910", "12833849", "11209533", "12211457", "15874713", "11440630", "12665305", "11437682", "11440628", "9578183", "11796739", "11213162", "12665208", "13887316"}
+	//str := []string{"token_gFkmTBCfctlpehYTENBNpw", "token_tnrjZftD5q4lU42KI3RPsQ", "token_ih9ZUCueA_dnrHBC6eBDew", "token_uJenwb2m6hWDe36e7hhAuw", "token_o2bWH171jXW8dIikHjFFog", "token_kfsqhhQ3kPXAwxUueglF_g", "token_h86ZqAP89I-Pe6vMACVLZQ", "token_uzWsBdnSIbv1KBQPoNRKRQ", "token_ucnSaUtKiUbonBnax5dDMQ", "token_o2-KGSi8lbh1ON4seUlEiQ", "token_v0gPiP4rH1vrS51GXgZJBg", "token_k0GWFzpjDtodAW5yFhVBgA", "token_oV2lXBnc1d8kc_JgWvtFxQ", "token_gl5GkKf9XKOO5ZNK-0JPRg", "token_suOF8ngaSTOcFcjNxvdHVA", "token_nf9QokI2udnECY2s1zBIeA", "token_nZjY3PlhFWlkHxdUDr9EsA", "token_kwq5HiBJI4vnavnmDyZBuA", "token_jhE-_ku5e7g6Ys4jWt5J0g", "token_lqAjjKmpEws1pKcspd1ETw", "token_mj31nyxnSIKFfxjViWpN4w", "token_kxjANA3lKNqfJrXApsZEEg", "token_kMttVFAYWLAcPAmZi3FNjg", "token_gd5aruWWQX2Iz8CXEg1Gaw", "token_j1HkNiZHh76aEGLqJT9Pfw", "token_muEkyBPPm6quxE2P2dlNQA", "token_uoHU5jcIZNx_QV0rZI1Now", "token_jj9M4B67tEr0DKgRiidDBQ", "token_gXpPtzRin_m9SEzohBJOFA", "token_rBIwyLoU2O6qfq2_VCdBQg", "token_qY6wArUbm8ypW1IoUc5Frw", "token_m5XZKS8TiL1ILCqy1flFjg", "token_n5xs7bSk96MekhNxWuJGPw", "token_oqbTOzEAZYvr4QgRIypA9w", "token_jmBHMy8LQi-TPa1fOsJJKQ", "token_nNzvPUZFeQ009kWinAhDiw", "token_q4EqYUsEXy726qXH1fdJeA", "token_o0aHQxC55_XjOLvWuYFFCQ", "token_k9vJhV8aAX2fN-39KZRGEA", "token_vdGAQ50zMvm_Ofqz1yJJwg", "token_r-XGhX8HFahkkDMelHxFbQ", "token_nHupX9FsP6nj6HWQm0RN2w", "token_hpNdSt3m1Hs-CKAiWZlMKw", "token_mQ16KE4knE2sdPP2r8ROSw", "token_uUrPsYavDU1ExUwEbuFG8Q", "token_oSSLl9h6zIt9hKz16e1N_g", "token_ifyMH0B_2YipwaBoBmdAdQ", "token_uryS4endUdFgySqEWo9Dwg", "token_kAFq-IIr_5KYQwo5wlhPcg", "token_shBMfRfZtOS1xaNn5MdI0Q", "token_sS0KoWshUu-WlGchoxBNcA"}
+	//for _, v := range info {
+	//	for _, i := range str {
+	//		err = New("5873", "41c479790a76f86326f89e8048964739", "", i).RetailCatDelete(v, "", "国产水果")
+	//		if err != nil {
+	//			errList.AddErr(err)
+	//		}
+	//	}
+	//}
 	//t.Fatal(errList)
-	//err := api.RetailCatDelete("8694203", "" /*utils.GetUpperUUID()*/, "国产水果")
-	//t.Fatal(err)
+	err := api.RetailCatDelete("8694203", "" /*utils.GetUpperUUID()*/, "国产水果")
+	t.Fatal(err)
 }
 
 func TestRetailList(t *testing.T) {