From ac53bf88babd8b179972d3f54aa0e4498d4993c5 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 25 Jun 2021 16:48:23 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E5=BA=8F=E5=88=97=E5=8C=96=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/apps/quality/serializers.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/apps/quality/serializers.py b/server/apps/quality/serializers.py index ba1e3ca..7ee7835 100644 --- a/server/apps/quality/serializers.py +++ b/server/apps/quality/serializers.py @@ -2,12 +2,12 @@ from re import template from django.db.models.base import Model from rest_framework import serializers from .models import * -from apps.system.serializers import OrganizationSerializer,FileListSerializer,UserSimpleSerializer,OrganizationSimpleSerializer, FileSimpleSerializer +from apps.system.serializers import FileSerializer, OrganizationSerializer,FileListSerializer,UserSimpleSerializer,OrganizationSimpleSerializer, FileSimpleSerializer from rest_framework.exceptions import ParseError, APIException class DocumentSerializer(serializers.ModelSerializer): - file_ = FileListSerializer(source='file', read_only=True) + file_ = FileSerializer(source='file', read_only=True) class Meta: model = Document fields = '__all__' From ac85dc248674895147bfd5ccd3dbd67652527ddb Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 25 Jun 2021 17:08:42 +0800 Subject: [PATCH 2/2] =?UTF-8?q?vod=E6=96=B9=E6=A1=88=E5=86=B3=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/apps/vod/models.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/server/apps/vod/models.py b/server/apps/vod/models.py index 1b5ac88..3bb9165 100644 --- a/server/apps/vod/models.py +++ b/server/apps/vod/models.py @@ -1,10 +1,14 @@ from django.db import models from utils.model import BaseModel -from apps.system.models import User, CommonAModel +from apps.system.models import User, CommonAModel, Dict # Create your models here. class Video(CommonAModel): - pass + + name = models.CharField(verbose_name='视频名称', max_length=100) + category = models.ForeignKey(Dict, verbose_name='视频分类') + description = models.TextField(verbose_name='视频描述') + class WatchRecord(BaseModel):