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

 Conflicts:
	server/config.yaml
This commit is contained in:
QM303176530
2020-07-02 14:34:08 +08:00
14 changed files with 102 additions and 44 deletions
+2 -3
View File
@@ -32,8 +32,8 @@ require (
github.com/pelletier/go-toml v1.6.0 // indirect
github.com/piexlmax/gvaplug v0.0.8
github.com/pkg/errors v0.9.1 // indirect
github.com/qiniu/api.v7 v7.2.5+incompatible
github.com/qiniu/x v7.0.8+incompatible // indirect
github.com/qiniu/x v1.10.5
github.com/qiniu/api.v7/v7 v7.4.1
github.com/satori/go.uuid v1.2.0
github.com/spf13/afero v1.2.2 // indirect
github.com/spf13/cast v1.3.1 // indirect
@@ -51,5 +51,4 @@ require (
google.golang.org/protobuf v1.24.0 // indirect
gopkg.in/ini.v1 v1.55.0 // indirect
gopkg.in/yaml.v2 v2.3.0 // indirect
qiniupkg.com/x v7.0.8+incompatible // indirect
)