Merge feature/merge-upstream: Modal 小屏 + 视频播放 + Docker Alpine（冲突以 feature 为准）

Browse Source

# Conflicts:
#	Dockerfile
#	Dockerfile-arm
#	dto/VideoPageRequestDTO.cs
#	model/AppConfig.cs
#	repository/DyCollectVideoRepository.cs
#	service/CommonService.cs
#	service/DyCollectVideoService.cs
#	service/DyHttpClientService.cs

...

This commit is contained in:

yuming

2026-07-03 20:03:46 +08:00

parent 8e8d256e9a e6c5587637

commit cf40a7e89a

203 changed files with 28876 additions and 10250 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

app/src/pages/set/AppSet.vue

+893 -122

File diff suppressed because it is too large Load Diff