Merge remote-tracking branch 'refs/remotes/origin/dev-mall' into release_20260829

Browse Source

# Conflicts:
#	src/main/java/com/budwk/app/sys/controller/v4/SysV4MsgController.java
#	src/main/resources/views/platform/zhghh5/sys/home/msg.js

...

This commit is contained in:

c-chengc1

2026-08-29 09:12:07 +08:00

parent c8461e6be5 44cf66c570

commit 60c3183d29

157 changed files with 13694 additions and 545 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/assets/mobile/img/mall/order/my-order.png

BIN

Binary file not shown.

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

src/main/resources/static/assets/mobile/img/mall/supplier-banner/supplier-banner-daily.png

BIN

Binary file not shown.

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

src/main/resources/static/assets/mobile/img/mall/supplier-banner/supplier-banner-quality.png

BIN

Binary file not shown.

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

src/main/resources/static/assets/mobile/img/mall/supplier-banner/supplier-banner-welfare.png

BIN

Binary file not shown.

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