Merge remote-tracking branch 'origin/feature_职代会' into feature_职代会UI优化

Browse Source

# Conflicts:
#	src/main/resources/views/layouts/platform_h5.html

...

This commit is contained in:

c-chengc1

2026-08-29 10:16:55 +08:00

parent 58218ad9c4 29f305d677

commit 35ea26b750

48 changed files with 8172 additions and 1 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

src/main/resources/static/images/congress/h5-congress-header.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.2 MiB