Merge pull request #71 in RMS/api-main-service from red-develop to RMSv2

* commit '90f89628':
  fixing model conflict

app/entities/migrations/0014_application_app_code.py → app/entities/migrations/0015_application_app_code.py

-# Generated by Django 2.2 on 2019-09-09 14:17
+# Generated by Django 2.2 on 2019-09-09 14:25
 
 from django.db import migrations, models
 
@@ -6,14 +6,14 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('entities', '0013_changerequesthistory'),
+        ('entities', '0014_auto_20190909_1415'),
     ]
 
     operations = [
         migrations.AddField(
             model_name='application',
             name='app_code',
-            field=models.CharField(default=1, max_length=255, unique=True),
+            field=models.CharField(default=1, max_length=255),
             preserve_default=False,
         ),
     ]

app/entities/models.py

@@ -26,7 +26,7 @@ class Application(AuditClass):
         max_length=255
     )
     name = models.CharField(unique=True, max_length=255)
-    app_code = models.CharField(unique=True, max_length=255)
+    app_code = models.CharField(max_length=255)
 
     class Meta:
         db_table = 'applications'