Merge branch 'feature/CHINARPA-3528' into feature/uat-tmp

@@ -18,7 +18,7 @@ from django.utils.translation import gettext, gettext_lazy as _
 from django.views.decorators.csrf import csrf_protect
 from django.views.decorators.csrf import csrf_protect
 from django.views.decorators.debug import sensitive_post_parameters
 from django.views.decorators.debug import sensitive_post_parameters
 from apps.myadmin.admin import admin_site
 from apps.myadmin.admin import admin_site
-from apps.doc.models import UserRole
+from apps.account.models import UserRole
 
 
 csrf_protect_m = method_decorator(csrf_protect)
 csrf_protect_m = method_decorator(csrf_protect)
 sensitive_post_parameters_m = method_decorator(sensitive_post_parameters())
 sensitive_post_parameters_m = method_decorator(sensitive_post_parameters())

@@ -3,3 +3,4 @@ from django.apps import AppConfig
 
 
 class AccountConfig(AppConfig):
 class AccountConfig(AppConfig):
     name = 'apps.account'
     name = 'apps.account'
+    verbose_name = '权限'

 from django.db import models
 from django.db import models
 
 
 # Create your models here.
 # Create your models here.
+class UserRole(models.Model):
+    id = models.AutoField(primary_key=True, verbose_name="id")  # 主键
+    auth_user_id = models.SmallIntegerField(null=False, default=0, verbose_name="auth_user_id")
+    role = models.SmallIntegerField(null=False, default=0, verbose_name="role")
+    menu_list = models.CharField(max_length=64, verbose_name="menu_list", blank=True)
+
+    class Meta:
+        managed = False
+        db_table = 'user_role'
+        verbose_name = '用户权限管理'
+        verbose_name_plural = verbose_name
\ No newline at end of file

@@ -9,7 +9,7 @@ from settings import conf
 from django.urls import reverse
 from django.urls import reverse
 from django.http import HttpResponseRedirect
 from django.http import HttpResponseRedirect
 from django.contrib.auth import login as auth_login
 from django.contrib.auth import login as auth_login
-from apps.doc.models import UserRole
+from apps.account.models import UserRole
 # from django.conf import settings
 # from django.conf import settings
 # from django.shortcuts import resolve_url, redirect
 # from django.shortcuts import resolve_url, redirect
 
 

 from django.contrib import admin
 from django.contrib import admin
-from .models import Keywords, Configs, UserRole
+from .models import Keywords, Configs
 from .named_enum import KeywordsType
 from .named_enum import KeywordsType
 from apps.myadmin.admin import admin_site
 from apps.myadmin.admin import admin_site
 
 
@@ -20,13 +20,7 @@ class ConfigsAdmin(admin.ModelAdmin):
     list_display = ('id', 'value', 'comment')
     list_display = ('id', 'value', 'comment')
 
 
 
 
-# Register your models here.
-class UserRoleAdmin(admin.ModelAdmin):
-    list_display = ('id', 'auth_user_id', 'role')
-
-
 admin_site.register(Keywords, KeywordsAdmin)
 admin_site.register(Keywords, KeywordsAdmin)
 admin_site.register(Configs, ConfigsAdmin)
 admin_site.register(Configs, ConfigsAdmin)
-admin_site.register(UserRole, UserRoleAdmin)
 # admin.site.site_header = '宝马OCR'
 # admin.site.site_header = '宝马OCR'
 # admin.site.site_title = '宝马OCR'
 # admin.site.site_title = '宝马OCR'

@@ -1102,14 +1102,4 @@ class HILCmsStatusInfo(models.Model):
 
 
     class Meta:
     class Meta:
         managed = False
         managed = False
-        db_table = 'hil_cms_status_info'
-class UserRole(models.Model):
-    id = models.AutoField(primary_key=True, verbose_name="id")  # 主键
-    auth_user_id = models.SmallIntegerField(null=False, default=0, verbose_name="auth_user_id")
-    role = models.SmallIntegerField(null=False, default=0, verbose_name="role")
-    menu_list = models.CharField(max_length=64, verbose_name="menu_list", blank=True)
-
-    class Meta:
-        managed = False
-        db_table = 'user_role'
-        verbose_name = '用户权限管理'
\ No newline at end of file
+        db_table = 'hil_cms_status_info'
\ No newline at end of file