# Conflicts: # src/pages-aigc/agreement/agreement.vue # src/pages-booking/index.vue # src/pages.json # src/request/api/AigcApi.js # src/utils/index.js 合并了代码
# Conflicts: # src/pages-aigc/agreement/agreement.vue # src/pages-booking/index.vue # src/pages.json # src/request/api/AigcApi.js # src/utils/index.js 合并了代码