perf: 解决冲突

apps/tickets/migrations/0018_applyapplicationticket_apply_actions.py

@@ -0,0 +1,22 @@
+# Generated by Django 3.2.14 on 2022-07-28 03:25
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ('tickets', '0017_auto_20220623_1027'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='applyapplicationticket',
+            name='apply_actions',
+            field=models.IntegerField(
+                choices=[
+                    (255, 'All'), (1, 'Connect'), (2, 'Upload file'), (4, 'Download file'), (6, 'Upload download'),
+                    (8, 'Clipboard copy'), (16, 'Clipboard paste'), (24, 'Clipboard copy paste')
+                ], default=255,
+                verbose_name='Actions'),
+        ),
+    ]

apps/tickets/migrations/0020_auto_20220817_1346.py

@@ -50,11 +50,6 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.AlterField(
-            model_name='applyapplicationticket',
-            name='apply_permission_name',
-            field=models.CharField(max_length=128, verbose_name='Permission name'),
-        ),
         migrations.AlterField(
             model_name='applyassetticket',
             name='apply_permission_name',