jjxu/fonchain-artistinfo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

解决冲突

Browse Source
This commit is contained in:
徐俊杰 2023-03-21 16:03:55 +08:00
commit d72727759a
3 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/internal/dao/artistInfo_user.go
View File

@ -764,9 +764,6 @@ func UpdateUserData(req *artistInfoUser.UserInfo) (rep *artistInfoUser.CommonNoP
if req.RealName.IdNum != "" { if req.RealName.IdNum != "" {
realName.IdNum = req.RealName.IdNum realName.IdNum = req.RealName.IdNum
} }
// if req.RealName.TelNum != "" {
// realName.TelNum = req.RealName.TelNum
// }
if req.RealName.IdCardFront != "" { if req.RealName.IdCardFront != "" {
realName.IdCardFront = req.RealName.IdCardFront realName.IdCardFront = req.RealName.IdCardFront
} }

2
cmd/internal/dao/artistinfo_statement.go
View File

@ -3,8 +3,6 @@ package dao
// import ( // import (
// "github.com/fonchain/fonchain-artistinfo/cmd/model" // "github.com/fonchain/fonchain-artistinfo/cmd/model"
// "github.com/fonchain/fonchain-artistinfo/pb/artistinfoStatement" // "github.com/fonchain/fonchain-artistinfo/pb/artistinfoStatement"
// db "github.com/fonchain/fonchain-artistinfo/pkg/db"
// "gorm.io/gorm/clause"
// ) // )
// ===================================== // =====================================

2
cmd/model/user.go
View File

@ -34,7 +34,7 @@ type User struct {
Htmltype string `gorm:"html_type" json:"htmltype"` Htmltype string `gorm:"html_type" json:"htmltype"`
Envtype string `gorm:"env_type" json:"envtype"` Envtype string `gorm:"env_type" json:"envtype"`
OldMgmtId int64 `gorm:"column:old_mgmt_id,comment:老管理系统用户id;"` OldMgmtId int64 `gorm:"column:old_mgmt_id;comment:老管理系统用户id;"`
//IsFdd int64 `gorm:"column:is_fdd;not null;comment:"` //IsFdd int64 `gorm:"column:is_fdd;not null;comment:"`
//Account string `gorm:"type:varchar(256) not null"` //Account string `gorm:"type:varchar(256) not null"`
//Name string `gorm:"type:varchar(20) not null"` //Name string `gorm:"type:varchar(20) not null"`