Browse Source

wip:冲突

wangshan 5 months ago
parent
commit
a0d9b064aa
1 changed files with 0 additions and 4 deletions
  1. 0 4
      go.mod

+ 0 - 4
go.mod

@@ -5,11 +5,7 @@ go 1.20
 require (
 	app.yhyue.com/moapp/jyMarketing v0.0.2-0.20230304035551-21bb1eedf547
 	app.yhyue.com/moapp/jyPoints v1.1.2-0.20231020023521-1a4b1bbf9736
-<<<<<<< HEAD
-	app.yhyue.com/moapp/jybase v0.0.0-20250208012652-ed633bf76e1b
-=======
 	app.yhyue.com/moapp/jybase v0.0.0-20250218064808-f3105db833dd
->>>>>>> master
 	app.yhyue.com/moapp/message v0.0.0-20231204024949-8c7145bfc161
 	bp.jydev.jianyu360.cn/BaseService/entManageApplication v0.0.0-20231226074509-942d80dc34eb
 	bp.jydev.jianyu360.cn/BaseService/jyMicroservices v0.0.2