From 5e611b1c8294f45aca2ba28fe47092d3c5912169 Mon Sep 17 00:00:00 2001 From: tommy <3405129587@qq.com> Date: Wed, 5 Aug 2020 11:27:05 +0800 Subject: [PATCH] fix:bug --- controllers/client/login.go | 1 + go.mod | 2 +- go.sum | 2 ++ main.go | 3 +-- models/order_entry_person.go | 3 ++- 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/controllers/client/login.go b/controllers/client/login.go index 2dbef7e..5bcbf4f 100644 --- a/controllers/client/login.go +++ b/controllers/client/login.go @@ -54,6 +54,7 @@ func (t *UserCtl) EntryLogin() { entryPeople.Token = token entryPeople.AreaName = area.Name entryPeople.ActivityName = activity.Name + entryPeople.IsSpecial = customer.IsSpecial t.JSON(map[string]interface{}{ "people": entryPeople, }) diff --git a/go.mod b/go.mod index c224465..7f83146 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.12 require ( github.com/360EntSecGroup-Skylar/excelize/v2 v2.0.1 github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53 // indirect - github.com/aws/aws-sdk-go v1.33.18 // indirect + github.com/aws/aws-sdk-go v1.33.19 // indirect github.com/chanxuehong/wechat v0.0.0-20200409104612-0a1fd76d7a3a github.com/dgrijalva/jwt-go v3.2.0+incompatible github.com/elazarl/go-bindata-assetfs v1.0.0 // indirect diff --git a/go.sum b/go.sum index ca4eb18..f051d06 100644 --- a/go.sum +++ b/go.sum @@ -67,6 +67,8 @@ github.com/aws/aws-sdk-go v1.33.9 h1:nkC8YxL1nxwshIoO3UM2486Ph+zs7IZWjhRHjmXeCPw github.com/aws/aws-sdk-go v1.33.9/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= github.com/aws/aws-sdk-go v1.33.18 h1:Ccy1SV2SsgJU3rfrD+SOhQ0jvuzfrFuja/oKI86ruPw= github.com/aws/aws-sdk-go v1.33.18/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= +github.com/aws/aws-sdk-go v1.33.19 h1:SMna0QLInNqm+nNL9tb7OVWTqSfNYSxrCa2adnyVth4= +github.com/aws/aws-sdk-go v1.33.19/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/bndr/gotabulate v1.1.2 h1:yC9izuZEphojb9r+KYL4W9IJKO/ceIO8HDwxMA24U4c= github.com/bndr/gotabulate v1.1.2/go.mod h1:0+8yUgaPTtLRTjf49E8oju7ojpU11YmXyvq1LbPAb3U= diff --git a/main.go b/main.go index c4ebc05..d731077 100644 --- a/main.go +++ b/main.go @@ -6,12 +6,11 @@ import ( "hudongzhuanjia/controllers/client" "hudongzhuanjia/controllers/common" "hudongzhuanjia/controllers/pc" - "hudongzhuanjia/utils/define" //_ "net/http/pprof" ) func main() { - define.SetDebug(true) + //define.SetDebug(true) // pc core.GetInstanceRouterManage().Registered(new(pc.WsCtl)) // 用户 diff --git a/models/order_entry_person.go b/models/order_entry_person.go index 4bb6fea..471492c 100644 --- a/models/order_entry_person.go +++ b/models/order_entry_person.go @@ -16,9 +16,10 @@ type OrderEntryPerson struct { Pid int `json:"pid" xorm:"not null default 0 comment('主账号') VARCHAR(255)"` AreaId int `json:"area_id" xorm:"not null default 0 comment('地区id') BIGINT(20)"` AreaName string `json:"area_name" xorm:"-"` - ActivityId int `json:"activity_id" xorm:"not null default 0 comment('主活动id') BIGINT(20)"` + ActivityId int `json:"activity_id" xorm:"not null default 0 comment('主活动id') BIGINT(20)"` ActivityName string `json:"activity_name" xorm:"-"` Token string `json:"token" xorm:"-"` + IsSpecial int `json:"is_special" xorm:"-"` IsDelete bool `json:"-" xorm:"not null default(0) comment('软删除') TINYINT(1)"` CreatedAt time.Time `json:"-" xorm:"not null created comment('创建时间') DATETIME"` UpdatedAt time.Time `json:"-" xorm:"not null updated comment('更新时间') DATETIME"`