Merge branch 'gin-vue-admin_v2_dev' of https://github.com/piexlmax/gin-vue-admin into gin-vue-admin_v2_dev

# Conflicts:
#	server/model/sys_authority.go
#	server/model/sys_authority_menu.go
#	server/model/sys_base_menu.go
This commit is contained in:
rainyan
2020-04-06 00:47:46 +08:00
28 changed files with 259 additions and 315 deletions
+2 -13
View File
@@ -17,7 +17,6 @@ type ExaCustomer struct {
// @title CreateExaCustomer
// @description create a customer, 创建用户
// @auth (2020/04/05 20:22 )
// @param newPassword string
// @return err error
func (e *ExaCustomer) CreateExaCustomer() (err error) {
err = global.GVA_DB.Create(e).Error
@@ -27,9 +26,6 @@ func (e *ExaCustomer) CreateExaCustomer() (err error) {
// @title DeleteFileChunk
// @description delete a customer, 删除用户
// @auth (2020/04/05 20:22 )
// @param FileMd5 string
// @param FileName string
// @param FilePath string
// @return error
func (e *ExaCustomer) DeleteExaCustomer() (err error) {
err = global.GVA_DB.Delete(e).Error
@@ -39,9 +35,6 @@ func (e *ExaCustomer) DeleteExaCustomer() (err error) {
// @title UpdateExaCustomer
// @description update a customer, 更新用户
// @auth (2020/04/05 20:22 )
// @param FileMd5 string
// @param FileName string
// @param FilePath string
// @return error
func (e *ExaCustomer) UpdateExaCustomer() (err error) {
err = global.GVA_DB.Save(e).Error
@@ -51,10 +44,8 @@ func (e *ExaCustomer) UpdateExaCustomer() (err error) {
// @title GetExaCustomer
// @description get the info of a costumer , 获取用户信息
// @auth (2020/04/05 20:22 )
// @param FileMd5 string
// @param FileName string
// @param FilePath string
// @return error
// @return customer ExaCustomer
func (e *ExaCustomer) GetExaCustomer() (err error, customer ExaCustomer) {
err = global.GVA_DB.Where("id = ?", e.ID).First(&customer).Error
return
@@ -63,9 +54,7 @@ func (e *ExaCustomer) GetExaCustomer() (err error, customer ExaCustomer) {
// @title GetInfoList
// @description get customer list by pagination, 分页获取用户列表
// @auth (2020/04/05 20:22 )
// @param FileMd5 string
// @param FileName string
// @param FilePath string
// @param info PageInfo
// @return error
func (e *ExaCustomer) GetInfoList(info PageInfo) (err error, list interface{}, total int) {
limit := info.PageSize