fix conflict
This commit is contained in:
commit
1d0c2f3aa4
|
@ -244,7 +244,7 @@ func (s SupplierUser) ChangePassword(p model.ChangePasswordRequest) error {
|
||||||
|
|
||||||
// CheckTokenSupplier ...
|
// CheckTokenSupplier ...
|
||||||
func (s SupplierUser) CheckTokenSupplier(p model.CheckTokenSupplierUserPayload) (*model.ResponseCheckTokenSupplierUser, error) {
|
func (s SupplierUser) CheckTokenSupplier(p model.CheckTokenSupplierUserPayload) (*model.ResponseCheckTokenSupplierUser, error) {
|
||||||
msg, err := natsio.GetServer().Request(subject.SupplierUser.CheckToken, toBytes(p))
|
msg, err := natsio.GetServer().Request(subject.SupplierUser.CheckTokenSupplierUser, toBytes(p))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
|
@ -20,6 +20,7 @@ var SupplierUser = struct {
|
||||||
ResetPassword string
|
ResetPassword string
|
||||||
ChangePassword string
|
ChangePassword string
|
||||||
CheckToken string
|
CheckToken string
|
||||||
|
CheckTokenSupplierUser string
|
||||||
}{
|
}{
|
||||||
// Users
|
// Users
|
||||||
LoginUser: getSupplierUserValue("login_user"),
|
LoginUser: getSupplierUserValue("login_user"),
|
||||||
|
@ -34,4 +35,5 @@ var SupplierUser = struct {
|
||||||
ResetPassword: getSupplierUserValue("reset_password"),
|
ResetPassword: getSupplierUserValue("reset_password"),
|
||||||
ChangePassword: getSupplierUserValue("change_password"),
|
ChangePassword: getSupplierUserValue("change_password"),
|
||||||
CheckToken: getSupplierUserValue("check_token"),
|
CheckToken: getSupplierUserValue("check_token"),
|
||||||
|
CheckTokenSupplierUser: getSupplierUserValue("check_token_supplier_user"),
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue