feat:合并

jyBXSubscribe/go.mod

@@ -3,11 +3,7 @@ module jyBXSubscribe
 go 1.18
 
 require (
-<<<<<<< HEAD
-	app.yhyue.com/moapp/jybase v0.0.0-20230420060106-a9c3f4187463
-=======
 	app.yhyue.com/moapp/jybase v0.0.0-20230504094413-7eab0c56bca0
->>>>>>> feature/v1.1.17
 	app.yhyue.com/moapp/jylogx v0.0.0-20230511070629-0ed867dc49d6
 	app.yhyue.com/moapp/jypkg v0.0.0-20230420060744-ff53e7ca6f47
 	bp.jydev.jianyu360.cn/BaseService/gateway v1.3.4

jyBXSubscribe/go.sum

@@ -6,16 +6,9 @@ app.yhyue.com/moapp/jybase v0.0.0-20220415064050-37ce64b3e2d4/go.mod h1:qNRA0sHu
 app.yhyue.com/moapp/jybase v0.0.0-20220418104200-46c3fff161c7/go.mod h1:qNRA0sHuYqcLoYoP8irpaWnW9YsXixe6obBIkwaXpD0=
 app.yhyue.com/moapp/jybase v0.0.0-20220420032112-668025915ee4/go.mod h1:qNRA0sHuYqcLoYoP8irpaWnW9YsXixe6obBIkwaXpD0=
 app.yhyue.com/moapp/jybase v0.0.0-20220421060131-a1001013ba46/go.mod h1:qNRA0sHuYqcLoYoP8irpaWnW9YsXixe6obBIkwaXpD0=
-<<<<<<< HEAD
-app.yhyue.com/moapp/jybase v0.0.0-20220617085837-48c1bf245c2f/go.mod h1:qNRA0sHuYqcLoYoP8irpaWnW9YsXixe6obBIkwaXpD0=
-app.yhyue.com/moapp/jybase v0.0.0-20230117032034-ad7c00ffe11a/go.mod h1:zB47XTeJvpcbtBRYgkQuxOICWNexiZfbUO+7aUf6mNs=
-app.yhyue.com/moapp/jybase v0.0.0-20230420060106-a9c3f4187463 h1:HhRvi41wOfoneH+lFMagIFfG2W20cxFzg24Iv827vi8=
-app.yhyue.com/moapp/jybase v0.0.0-20230420060106-a9c3f4187463/go.mod h1:zB47XTeJvpcbtBRYgkQuxOICWNexiZfbUO+7aUf6mNs=
-=======
 app.yhyue.com/moapp/jybase v0.0.0-20230117032034-ad7c00ffe11a/go.mod h1:zB47XTeJvpcbtBRYgkQuxOICWNexiZfbUO+7aUf6mNs=
 app.yhyue.com/moapp/jybase v0.0.0-20230504094413-7eab0c56bca0 h1:7nytYrlgWX4Wh3tYEPTZco5dTYPLZTXuObkdr0oaups=
 app.yhyue.com/moapp/jybase v0.0.0-20230504094413-7eab0c56bca0/go.mod h1:zB47XTeJvpcbtBRYgkQuxOICWNexiZfbUO+7aUf6mNs=
->>>>>>> feature/v1.1.17
 app.yhyue.com/moapp/jylog v0.0.0-20230511065424-895d5b2cedfd h1:jBP9rucnTd0KHm/slWsoEoUxnlfMjVSiAKhLfzh9Dvc=
 app.yhyue.com/moapp/jylog v0.0.0-20230511065424-895d5b2cedfd/go.mod h1:hlsdPMebg8N90L57xkxJdVVFuvtlT8SuZLM6hY+jB44=
 app.yhyue.com/moapp/jylogx v0.0.0-20230511070629-0ed867dc49d6 h1:EcZlCF2NWWD/5VIn9lGhSnQAiD1i8vfr/RE+CsQxroQ=
@@ -28,11 +21,6 @@ bp.jydev.jianyu360.cn/BaseService/entManageApplication v0.0.0-20230214091519-89a
 bp.jydev.jianyu360.cn/BaseService/gateway v0.0.0-20220419090715-88ddb32961be/go.mod h1:Yj4oabIGItuMoF0BXYLz2XAnF581kxgXBrvlUtIJrkI=
 bp.jydev.jianyu360.cn/BaseService/gateway v1.3.4 h1:zl5eZrKDBENVVBUiPpzyQQ0/SBdGUmZS3thXycSEO1g=
 bp.jydev.jianyu360.cn/BaseService/gateway v1.3.4/go.mod h1:BMLd/5wb3BIEGhnEgF9y1sJN9P5/Dw9kYsoiE9V8I9g=
-<<<<<<< HEAD
-bp.jydev.jianyu360.cn/BaseService/jyCodeService v0.0.0-20220927093612-72958b15cdf0 h1:IxOy/G/OzOmDql81jdDfgiwvh0GYcTcuCob875KsF6o=
-bp.jydev.jianyu360.cn/BaseService/jyCodeService v0.0.0-20220927093612-72958b15cdf0/go.mod h1:Def9i6RggnFvYswG767+jI+S7wMPkzx3D7Bs6Gnj2Q8=
-=======
->>>>>>> feature/v1.1.17
 bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20230222052351-9d6fad062447 h1:hrBqrsf2QHTrnoR9VTV4w7g2akDfbpQ+umNQvkkNs+Y=
 bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20230222052351-9d6fad062447/go.mod h1:5nimT8GJh46AyfeeDeyRlDQygMlO7TRM8Pwm41Gxemc=
 bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.0-20220418005748-8ba5d936dd53/go.mod h1:E5lcDI3k4FESLxiAetCfWQTq8qfpy9cv0yN1oKoEO34=
@@ -1119,10 +1107,6 @@ golang.org/x/sys v0.0.0-20220429233432-b5fbb4746d32/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-<<<<<<< HEAD
-golang.org/x/sys v0.0.0-20220829200755-d48e67d00261/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-=======
->>>>>>> feature/v1.1.17
 golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU=
 golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=