Merge remote-tracking branch 'origin/feature/v1.2灵机空间-内容上传审核_rxd' into test

Browse Source

# Conflicts:
#	src/views/property-marketing/media-account/account-manage/components/add-account-modal/index.vue

...

This commit is contained in:

rd

2025-08-15 10:32:57 +08:00

parent 9571c2bf7b af174dbbed

commit 1b0554a3cf

28 changed files with 176 additions and 103 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

BIN

src/assets/img/media-account/icon-dy.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.8 KiB

BIN

src/assets/img/media-account/icon-xhs.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 26 KiB

BIN

src/assets/img/platform/icon-dy.png Normal file

Binary file not shown.

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

BIN

src/assets/img/platform/icon-xhs.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 656 B