Skip to content

Commit 1a279aa

Browse files
fanhua-bytedancefanhua-bytedance
committed
merge: resolve conflicts with main, regenerate kitex_gen and wire_gen
2 parents a48b68b + 7a3ce58 commit 1a279aa

52 files changed

Lines changed: 16861 additions & 4911 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ go.work.sum
2121
# the result of the go build
2222
output/
2323

24+
# local tool binaries
25+
backend/bin/
26+
2427
# Files generated by IDEs
2528
.idea/
2629
*.iml

‎backend/api/handler/coze/loop/apis/observability_trace_service.go‎

Lines changed: 19 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎backend/api/router/coze/loop/apis/coze.loop.apis.go‎

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎backend/api/router/coze/loop/apis/middleware.go‎

Lines changed: 30 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎backend/kitex_gen/coze/loop/apis/observabilitytraceservice/client.go‎

Lines changed: 18 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎backend/kitex_gen/coze/loop/apis/observabilitytraceservice/observabilitytraceservice.go‎

Lines changed: 108 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎backend/kitex_gen/coze/loop/observability/observabilitytraceservice/client.go‎

Lines changed: 18 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)