Merge branches 'master' and 'operation-record' of https://github.com/flipped-aurora/gin-vue-admin into operation-record

Browse Source

 Conflicts:

	server/config.yaml

...

This commit is contained in:

QM303176530

2020-07-02 14:34:08 +08:00

parent 974b7c7b81 4153eb9435

commit ec53501431

14 changed files with 102 additions and 44 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

web/src/api/sys_dictionary.js → web/src/api/sysDictionary.js

web/src/api/sys_dictionary_detail.js → web/src/api/sysDictionaryDetail.js