Merge branches 'master' and 'xzj' of https://gitee.com/darlk/ShengTangManage into xzj

Browse Source

...

This commit is contained in:

xiezhijun

2021-01-24 09:24:16 +08:00

parent c4fe017d4d 25de0afa3f

commit d0d4352eaf

8 changed files with 653 additions and 543 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

stdiet-ui/src/assets/icons/svg/contract.svg

+2

File diff suppressed because one or more lines are too long

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

stdiet-ui/src/assets/icons/svg/dishes-menu.svg

+2

File diff suppressed because one or more lines are too long

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

stdiet-ui/src/assets/icons/svg/dishes.svg

+2

File diff suppressed because one or more lines are too long

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

stdiet-ui/src/assets/icons/svg/ingredient.svg

+2

File diff suppressed because one or more lines are too long

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

stdiet-ui/src/assets/icons/svg/order-list.svg

+2

File diff suppressed because one or more lines are too long

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

stdiet-ui/src/views/custom/dishes/index.vue

+627 -542

File diff suppressed because it is too large Load Diff