Merge branch 'master' of https://github.com/flipped-aurora/gin-vue-admin into gva_gormv2_dev

 Conflicts:
	server/model/request/common.go
This commit is contained in:
pixel
2021-05-06 13:21:51 +08:00
32 changed files with 884 additions and 391 deletions
+1 -1
View File
@@ -247,7 +247,7 @@
<el-input v-model="config.qiniu.imgPath"></el-input>
</el-form-item>
<el-form-item label="是否使用https">
<el-checkbox v-model="config.qiniu.imgPath">开启</el-checkbox>
<el-checkbox v-model="config.qiniu.useHttps">开启</el-checkbox>
</el-form-item>
<el-form-item label="accessKey">
<el-input v-model="config.qiniu.accessKey"></el-input>