Merge branch 'feature/RMS.v2.1-AMS' into 'product-dev'

Feature/rms.v2.1 ams

See merge request rms/Backend/api-main-service!1019

requirements/RMSv2.postman_collection.json

@@ -3558,7 +3558,7 @@
 								],
 								"body": {
 									"mode": "raw",
-									"raw": "{\n\t\"name\": \"Asset Group 1\",\n\t\"asset_group\": \"JTC\",\n\t\"created_by\": \"USER-20190923-0000001\"\n}"
+									"raw": "{\n\t\"name\": \"\"\n}"
 								},
 								"url": {
 									"raw": "{{baseurl}}/asset-management/asset-group/",
@@ -3588,7 +3588,7 @@
 								],
 								"body": {
 									"mode": "raw",
-									"raw": "{\r\n    \"id\": 1,\r\n    \"code\": \"ASSTGRP-20200317-0000001\",\r\n    \"name\": \"Asset Group 1\",\r\n    \"created_by\": \"USER-20190923-0000001\"\r\n}"
+									"raw": "{\r\n    \"name\": \"Asset Group 1\"\r\n}"
 								},
 								"url": {
 									"raw": "{{baseurl}}/asset-management/asset-group/ASSTGRP-20200317-0000001/",
@@ -3667,14 +3667,14 @@
 									"raw": ""
 								},
 								"url": {
-									"raw": "{{baseurl}}/asset-management/asset-group/AMSGRP-20191025-0000002/",
+									"raw": "{{baseurl}}/asset-management/asset-group/ASSTGRP-20200319-0000002/",
 									"host": [
 										"{{baseurl}}"
 									],
 									"path": [
 										"asset-management",
 										"asset-group",
-										"AMSGRP-20191025-0000002",
+										"ASSTGRP-20200319-0000002",
 										""
 									]
 								}
@@ -3755,7 +3755,7 @@
 								],
 								"body": {
 									"mode": "raw",
-									"raw": "{\n\t\"name\": \"cctv11\",\n\t\"dynamic_fied\": \"\",\n\t\"created_by\": \"USER-20190923-0000001\"\n}"
+									"raw": "{\n\t\"name\": \"cctv12\",\n\t\"dynamic_fied\": \"\"\n}"
 								},
 								"url": {
 									"raw": "{{baseurl}}/asset-management/asset-type/",
@@ -3846,14 +3846,14 @@
 								"method": "PATCH",
 								"header": [],
 								"url": {
-									"raw": "{{baseurl}}/asset-management/asset-type/RPT-20200318-0000005/restore/",
+									"raw": "{{baseurl}}/asset-management/asset-type/ASSTTYPE-20200318-0000003/restore/",
 									"host": [
 										"{{baseurl}}"
 									],
 									"path": [
 										"asset-management",
 										"asset-type",
-										"RPT-20200318-0000005",
+										"ASSTTYPE-20200318-0000003",
 										"restore",
 										""
 									]
@@ -4012,7 +4012,7 @@
 								],
 								"body": {
 									"mode": "raw",
-									"raw": "{\n\t\"name\": \"g1a\",\n\t\"asset_type\": \"ASSTTYPE-20200318-0000003\"\n\t\n}"
+									"raw": "{\n\t\"name\": \"g1a\",\n\t\"asset_type\": \"ASSTTYPE-20200318-0000003\"\n}"
 								},
 								"url": {
 									"raw": "{{baseurl}}/asset-management/asset/",
@@ -4042,7 +4042,7 @@
 								],
 								"body": {
 									"mode": "raw",
-									"raw": "{\n\t\"name\": \"update\",\n\t\"asset_type\": \"ASSTTYPE-20200318-0000003\"\n\t\n}\t"
+									"raw": "{\n\t\"name\": \"update\",\n\t\"asset_type\": \"ASSTTYPE-20200318-0000003\"\n}\t"
 								},
 								"url": {
 									"raw": "{{baseurl}}/asset-management/asset/ASST-20200319-0000006/",
@@ -4775,7 +4775,7 @@
 		"bearer": [
 			{
 				"key": "token",
-				"value": "ea1e1826304c647673d57c3e0bc89738bc89c0ac",
+				"value": "c62f448746704fabc7094417bdb2bab4d635a68c",
 				"type": "string"
 			}
 		]