[Copyright] 修改copyrite

apps/perms/templates/perms/asset_permission_list.html

@@ -7,7 +7,6 @@
 {% endblock %}
 
 {% block table_head %}
-    <th class="text-center">{% trans 'ID' %}</th>
     <th class="text-center">{% trans 'Name' %}</th>
     <th class="text-center">{% trans 'User' %}</th>
     <th class="text-center">{% trans 'User group' %}</th>
@@ -21,7 +20,6 @@
 {% block table_body %}
      {% for asset_permission in asset_permission_list %}
          <tr class="gradeX">
-             <td class="text-center">{{ asset_permission.id }}</td>
              <td class="text-center">
                  <a href="{% url 'perms:asset-permission-detail' pk=asset_permission.id %}">
                      {{ asset_permission.name }}

apps/templates/_footer.html

@@ -4,6 +4,6 @@
         <img style="display: none" src="http://www.jumpserver.org/img/evaluate_avatar1.jpg">
     </div>
     <div>
-        <strong>Copyright</strong> Jumpserver.org Team &copy; 2014-2017
+        <strong>Copyright</strong> 北京堆栈科技有限公司 &copy; 2014-2017
     </div>
 </div>
\ No newline at end of file

apps/users/models/user.py

@@ -43,8 +43,7 @@ class User(AbstractUser):
     _public_key = models.CharField(max_length=5000, blank=True, verbose_name=_('ssh public key'))
     comment = models.TextField(max_length=200, blank=True, verbose_name=_('Comment'))
     is_first_login = models.BooleanField(default=False)
-    date_expired = models.DateTimeField(default=date_expired_default, blank=True, null=True,
-                                        verbose_name=_('Date expired'))
+    date_expired = models.DateTimeField(default=date_expired_default, blank=True, null=True, verbose_name=_('Date expired'))
     created_by = models.CharField(max_length=30, default='', verbose_name=_('Created by'))
 
     @property