fix conflicts

Browse Source

...

This commit is contained in:

RockYang

2024-03-12 18:03:24 +08:00

parent be379b6d63 2de655a1cf

commit 72f80a96bc

239 changed files with 602 additions and 452 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

new-ui/projects/vue-admin/public/favicon.ico Normal file

Binary file not shown.

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

BIN

new-ui/projects/vue-admin/public/images/alipay.jpg Normal file

Binary file not shown.

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

BIN

new-ui/projects/vue-admin/public/images/avatar/artist.jpg Normal file

Binary file not shown.

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

BIN

new-ui/projects/vue-admin/public/images/avatar/dou_yin.jpg Normal file

Binary file not shown.

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

BIN

new-ui/projects/vue-admin/public/images/avatar/elon_musk.jpg Normal file

Binary file not shown.

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

BIN

new-ui/projects/vue-admin/public/images/avatar/english_trainer.jpg Normal file

Binary file not shown.

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

BIN

new-ui/projects/vue-admin/public/images/avatar/girl_friend.jpg Normal file

Binary file not shown.

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

BIN

new-ui/projects/vue-admin/public/images/avatar/good_comment.jpg Normal file

Binary file not shown.

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

BIN

new-ui/projects/vue-admin/public/images/avatar/gpt.png Normal file

Binary file not shown.

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

BIN

new-ui/projects/vue-admin/public/images/avatar/kong_zi.jpg Normal file

Binary file not shown.

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

BIN

new-ui/projects/vue-admin/public/images/avatar/lu_xun.jpg Normal file

Binary file not shown.

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

BIN

new-ui/projects/vue-admin/public/images/avatar/mid_journey.png Normal file

Binary file not shown.

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

BIN

new-ui/projects/vue-admin/public/images/avatar/programmer.jpg Normal file

Binary file not shown.

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

BIN

new-ui/projects/vue-admin/public/images/avatar/psychiatrist.jpg Normal file

Binary file not shown.

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

BIN

new-ui/projects/vue-admin/public/images/avatar/red_book.jpg Normal file

Binary file not shown.

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

BIN

new-ui/projects/vue-admin/public/images/avatar/seller.jpg Normal file

Binary file not shown.

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

BIN

new-ui/projects/vue-admin/public/images/avatar/steve_jobs.jpg Normal file

Binary file not shown.

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

BIN

new-ui/projects/vue-admin/public/images/avatar/teacher.jpg Normal file

Binary file not shown.

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

BIN

new-ui/projects/vue-admin/public/images/avatar/translator.jpg Normal file

Binary file not shown.

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

BIN

new-ui/projects/vue-admin/public/images/avatar/user.png Normal file

Binary file not shown.

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

BIN

new-ui/projects/vue-admin/public/images/avatar/weekly_report.jpg Normal file

Binary file not shown.

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

BIN

new-ui/projects/vue-admin/public/images/avatar/yi_yan.png Normal file

Binary file not shown.

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

BIN

new-ui/projects/vue-admin/public/images/chat.png Normal file

Binary file not shown.

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

BIN

new-ui/projects/vue-admin/public/images/logo.png Normal file

Binary file not shown.

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

BIN

new-ui/projects/vue-admin/public/images/mic.gif Normal file

Binary file not shown.

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

BIN

new-ui/projects/vue-admin/public/images/mj.png Normal file

Binary file not shown.

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

BIN

new-ui/projects/vue-admin/public/images/reward.png Normal file

Binary file not shown.

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

BIN

new-ui/projects/vue-admin/public/images/sd.png Normal file

Binary file not shown.

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

BIN

new-ui/projects/vue-admin/public/images/user-info.jpg Normal file

Binary file not shown.

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

BIN

new-ui/projects/vue-admin/public/images/vip.png Normal file

Binary file not shown.

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

BIN

new-ui/projects/vue-admin/public/images/wechat-pay.png Normal file

Binary file not shown.

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

BIN

new-ui/projects/vue-admin/public/images/wx.png Normal file

Binary file not shown.

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

BIN

new-ui/projects/vue-admin/public/left-img.png Normal file

Binary file not shown.

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