Add obsolete tokens, resolve conflicts, bump ent

Signed-off-by: m.nabokikh <maksim.nabokikh@flant.com>

storage/ent/db/devicetoken.go

@@ -36,13 +36,13 @@ func (*DeviceToken) scanValues(columns []string) ([]interface{}, error) {
 	for i := range columns {
 		switch columns[i] {
 		case devicetoken.FieldToken:
-			values[i] = &[]byte{}
+			values[i] = new([]byte)
 		case devicetoken.FieldID, devicetoken.FieldPollInterval:
-			values[i] = &sql.NullInt64{}
+			values[i] = new(sql.NullInt64)
 		case devicetoken.FieldDeviceCode, devicetoken.FieldStatus:
-			values[i] = &sql.NullString{}
+			values[i] = new(sql.NullString)
 		case devicetoken.FieldExpiry, devicetoken.FieldLastRequest:
-			values[i] = &sql.NullTime{}
+			values[i] = new(sql.NullTime)
 		default:
 			return nil, fmt.Errorf("unexpected column %q for type DeviceToken", columns[i])
 		}