Merge branch 'master' of https://e.coding.net/ctcdevteam/cma_search
This commit is contained in:
commit
41d63a1f95
|
|
@ -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__'
|
||||
|
|
|
|||
|
|
@ -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):
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue