From 7c08b2374f54fc52ad2cbe93f8d89a03deaa5ef8 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 23 Mar 2023 17:46:20 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20rpjlog=E7=BC=BA=E5=B0=91=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rpm/migrations/0009_auto_20230323_1745.py | 26 +++++++++++++++++++ apps/rpm/models.py | 4 +-- 2 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 apps/rpm/migrations/0009_auto_20230323_1745.py diff --git a/apps/rpm/migrations/0009_auto_20230323_1745.py b/apps/rpm/migrations/0009_auto_20230323_1745.py new file mode 100644 index 00000000..82f5681a --- /dev/null +++ b/apps/rpm/migrations/0009_auto_20230323_1745.py @@ -0,0 +1,26 @@ +# Generated by Django 3.2.12 on 2023-03-23 09:45 + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('rpm', '0008_auto_20230323_1740'), + ] + + operations = [ + migrations.AddField( + model_name='rpjlog', + name='create_by', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='rpjlog_create_by', to=settings.AUTH_USER_MODEL, verbose_name='创建人'), + ), + migrations.AddField( + model_name='rpjlog', + name='update_by', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='rpjlog_update_by', to=settings.AUTH_USER_MODEL, verbose_name='最后编辑人'), + ), + ] diff --git a/apps/rpm/models.py b/apps/rpm/models.py index f79b13a5..0867e0df 100644 --- a/apps/rpm/models.py +++ b/apps/rpm/models.py @@ -1,7 +1,7 @@ from django.db import models from apps.hrm.models import Certificate, Employee from apps.system.models import Dept, Dictionary, File, User -from apps.utils.models import CommonAModel, CommonBDModel, CommonBModel, BaseModel +from apps.utils.models import CommonAModel, CommonBDModel, CommonBModel, CommonADModel, BaseModel from apps.wf.models import Ticket @@ -143,7 +143,7 @@ class Rpjcertificate(BaseModel): file = models.CharField('文件地址', max_length=1000, null=True, blank=True) -class RpjLog(BaseModel): +class RpjLog(CommonADModel): """项目变更日志 Args: