处理冲突
This commit is contained in:
parent
87c158888a
commit
54a51f3a2c
|
@ -1,4 +1,3 @@
|
||||||
from numpy import product
|
|
||||||
from apps.system.models import CommonAModel
|
from apps.system.models import CommonAModel
|
||||||
from django.db import models
|
from django.db import models
|
||||||
from django.contrib.auth.models import AbstractUser
|
from django.contrib.auth.models import AbstractUser
|
||||||
|
|
Loading…
Reference in New Issue