fix:bug

main.go

@@ -6,11 +6,12 @@ import (
 	"hudongzhuanjia/controllers/client"
 	"hudongzhuanjia/controllers/common"
 	"hudongzhuanjia/controllers/pc"
+	"hudongzhuanjia/utils/define"
 	//_ "net/http/pprof"
 )
 
 func main() {
-	//define.SetDebug(true)
+	define.SetDebug(true)
 
 	// pc
 	core.GetInstanceRouterManage().Registered(new(pc.WsCtl))               // 用户

models/customer_order.go

@@ -102,11 +102,7 @@ func (t *CustomerOrder) SumCustomerOrder(activityId, rehearsalId, archId interfa
 	res := make([]map[string]string, 0)
 	err := core.GetXormAuto().Table(t).Select("order_entry_person_id, order_entry_person_name, COALESCE(SUM(goods_num), 0) as num").
 		NoAutoCondition().Where("is_delete=0 and activity_id=? and rehearsal_id=? and arch_id=?",
-<<<<<<< Updated upstream
 		activityId, rehearsalId, archId).GroupBy("order_entry_person_id,order_entry_person_name").Limit(limit).
-=======
-		activityId, rehearsalId, archId).GroupBy("order_entry_person_id, order_entry_person_name").Limit(limit).
->>>>>>> Stashed changes
 		Desc("num").Find(&res)
 	return res, err
 }

utils/define/config.go

@@ -12,7 +12,7 @@ func SetDebug(modes ...bool) {
 		//RoomPrefix = "test_"
 		HOST = "https://hdzj.utools.club"
 		H5Host = "http://ouxuanhudongtest.t.3pr.com.cn/web"
-		SendUrl = "https://hdzjws.utools.club/PcClient/Ws/MessageCtl/Receive"
+		SendUrl = "https://wsouxuanhudong.utools.club/PcClient/Ws/MessageCtl/Receive"
 		CallbackOrderUrl = "https://hdzj.utools.club/PcClient/common/WeChatOauthCtl/callbackOrder"
 	}
 }