Merge branch 'dev' into alpha

pull/398/head
Michael Li 1 year ago
commit 2b342cfe23
No known key found for this signature in database

@ -36,7 +36,7 @@ func newUserManageService(db *gorm.DB, ums core.UserMetricServantA) core.UserMan
return &userManageSrv{ return &userManageSrv{
db: db, db: db,
ums: ums, ums: ums,
_userProfileJoins: fmt.Sprintf("JOIN %s m ON %s.id=m.user_id", _userMetric_, _user_), _userProfileJoins: fmt.Sprintf("LEFT JOIN %s m ON %s.id=m.user_id", _userMetric_, _user_),
_userProfileWhere: fmt.Sprintf("%s.username=? AND %s.is_del=0", _user_, _user_), _userProfileWhere: fmt.Sprintf("%s.username=? AND %s.is_del=0", _user_, _user_),
_userProfileColoumns: []string{ _userProfileColoumns: []string{
fmt.Sprintf("%s.id", _user_), fmt.Sprintf("%s.id", _user_),

Loading…
Cancel
Save