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

Model/models.py

@@ -3732,9 +3732,9 @@ class IotCardUsageHistory(models.Model):
 class CityInformation(models.Model):
     id = models.AutoField(primary_key=True, verbose_name='自增id')
     city_id = models.IntegerField(default=0, verbose_name='城市id')
-    city_name = models.CharField(default='', max_length=50, verbose_name='城市名称')
-    secondary_name = models.CharField(default='', max_length=50, verbose_name='市级名称')
-    province_name = models.CharField(default='', max_length=30, verbose_name='省级名称')
+    district = models.CharField(default='', max_length=32, verbose_name='区级名称')
+    city = models.CharField(default='', max_length=32, verbose_name='市级名称')
+    region = models.CharField(default='', max_length=30, verbose_name='省级名称')
 
     class Meta:
         db_table = 'city_information'