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

@@ -18,6 +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
 
 
 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())
@@ -203,6 +204,11 @@ class UserAdmin(admin.ModelAdmin):
             request.POST['_continue'] = 1
             request.POST['_continue'] = 1
         return super().response_add(request, obj, post_url_continue)
         return super().response_add(request, obj, post_url_continue)
 
 
+# Register your models here.
+class UserRoleAdmin(admin.ModelAdmin):
+    list_display = ('id', 'auth_user_id', 'role')
+
 
 
 admin_site.register(Group, GroupAdmin)
 admin_site.register(Group, GroupAdmin)
 admin_site.register(User, UserAdmin)
 admin_site.register(User, UserAdmin)
+admin_site.register(UserRole, UserRoleAdmin)

 from django.contrib import admin
 from django.contrib import admin
-from .models import Keywords, Configs
+from .models import Keywords, Configs, UserRole
 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,7 +20,13 @@ 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'

@@ -1107,8 +1107,9 @@ class UserRole(models.Model):
     id = models.AutoField(primary_key=True, verbose_name="id")  # 主键
     id = models.AutoField(primary_key=True, verbose_name="id")  # 主键
     auth_user_id = models.SmallIntegerField(null=False, default=0, verbose_name="auth_user_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")
     role = models.SmallIntegerField(null=False, default=0, verbose_name="role")
-    menu_list = models.CharField(max_length=64, verbose_name="menu_list")
+    menu_list = models.CharField(max_length=64, verbose_name="menu_list", blank=True)
 
 
     class Meta:
     class Meta:
         managed = False
         managed = False
         db_table = 'user_role'
         db_table = 'user_role'
+        verbose_name = '用户权限管理'
\ No newline at end of file