Эх сурвалжийг харах

Merge remote-tracking branch 'remotes/origin/locky' into test

Ansjer 2 жил өмнө
parent
commit
4d1f89552b
1 өөрчлөгдсөн 1 нэмэгдсэн , 1 устгасан
  1. 1 1
      Model/models.py

+ 1 - 1
Model/models.py

@@ -184,7 +184,7 @@ class Device_User(AbstractBaseUser):
     fingerprint_key = models.CharField(max_length=128, default='', verbose_name=u'客户端用于解码的密钥等信息')
     is_local = models.BooleanField(blank=True, default=False, verbose_name=u'是否是本地登录用户')  # False:账号登录,1:本地登录
     subscribe_email = models.SmallIntegerField(default=0, verbose_name=u'是否订阅营销邮件')  # 0:未订阅,1:订阅,2:不订阅
-    region_country = models.IntegerField(blank=True, default=0, verbose_name='地区表唯一标识')
+    region_country = models.IntegerField(blank=True, default=0, verbose_name='关联tb_country表id')
     objects = UserManager()
 
     USERNAME_FIELD = 'userID'  # 必须有一个唯一标识