lmk 285a0fc632 Merge remote-tracking branch 'origin/dev' into dev ...

# Conflicts:
#	controller/copydata/campaign_report_controller.go
#	controller/copydata/population_report_controller.go
#	controller/copydata/unit_report_controller.go
#	controller/dict/api_field_mapping_config_controller.go
#	controller/tencent/oauth_controller.go
#	dao/copydata/api_account_report_detail_dao.go
#	dao/copydata/api_account_report_sum_dao.go
#	dao/copydata/campaign_report_detail_dao.go
#	dao/copydata/campaign_report_sum_dao.go
#	dao/copydata/creative_report_detail_dao.go
#	dao/copydata/creative_report_sum_dao.go
#	dao/copydata/material_report_dao.go
#	dao/copydata/population_report_dao.go
#	dao/copydata/storewide_report_detail_dao.go
#	dao/copydata/storewide_report_sum_dao.go
#	dao/copydata/task_report_dao.go
#	dao/copydata/unit_report_detail_dao.go
#	dao/copydata/unit_report_sum_dao.go
#	dao/dict/api_field_mapping_config_dao.go
#	dao/tencent/account_relation_dao.go
#	dao/tencent/audio_dao.go
#	dao/tencent/image_dao.go
#	dao/tencent/video_dao.go
#	deploy-k3s.ps1
#	model/dto/copydata/api_account_report_detail_dto.go
#	model/dto/copydata/api_account_report_sum_dto.go
#	model/dto/copydata/campaign_report_detail_dto.go
#	model/dto/copydata/campaign_report_sum_dto.go
#	model/dto/copydata/creative_report_detail_dto.go
#	model/dto/copydata/creative_report_sum_dto.go
#	model/dto/copydata/material_report_dto.go
#	model/dto/copydata/population_report_dto.go
#	model/dto/copydata/storewide_report_detail_dto.go
#	model/dto/copydata/storewide_report_sum_dto.go
#	model/dto/copydata/task_report_dto.go
#	model/dto/copydata/unit_report_detail_dto.go
#	model/dto/copydata/unit_report_sum_dto.go
#	model/dto/dict/api_field_mapping_config_dto.go
#	model/entity/copydata/api_account_report_detail.go
#	model/entity/copydata/api_account_report_sum.go
#	model/entity/copydata/campaign_report_detail.go
#	model/entity/copydata/campaign_report_sum.go
#	model/entity/copydata/creative_report_detail.go
#	model/entity/copydata/creative_report_sum.go
#	model/entity/copydata/material_report.go
#	model/entity/copydata/population_report.go
#	model/entity/copydata/storewide_report_detail.go
#	model/entity/copydata/storewide_report_sum.go
#	model/entity/copydata/task_report.go
#	model/entity/copydata/unit_report_detail.go
#	model/entity/copydata/unit_report_sum.go
#	model/entity/tencent/image.go
#	model/entity/tencent/video.go
#	scheduler/run_account_report_task.go
#	service/copydata/api_account_report_service.go
#	service/copydata/campaign_report_service.go
#	service/copydata/creative_report_sum_service.go
#	service/copydata/material_report_service.go
#	service/copydata/storewide_report_sum_service.go
#	service/copydata/task_report_service.go
#	service/copydata/unit_report_service.go
#	service/dict/api_field_mapping_config_service.go
#	service/tencent/image_service.go
#	service/tencent/video_service.go

2026-06-11 10:15:44 +08:00

4.3 KiB

Raw Blame History

View Raw