处理冲突
This commit is contained in:
parent
378e833090
commit
7eda1cc7a5
|
@ -6,7 +6,6 @@ import django.utils.timezone as timezone
|
||||||
from django.db.models.query import QuerySet
|
from django.db.models.query import QuerySet
|
||||||
|
|
||||||
from utils.model import SoftModel, BaseModel
|
from utils.model import SoftModel, BaseModel
|
||||||
from simple_history.models import HistoricalRecords
|
|
||||||
from apps.mtm.models import Material
|
from apps.mtm.models import Material
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue