[BAEL-14274] - Fixed conflicts

This commit is contained in:
amit2103
2019-10-27 18:01:15 +05:30
parent db85c8f275
commit 31763c9733
20514 changed files with 1642278 additions and 0 deletions
@@ -0,0 +1,17 @@
# User
## Properties
Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
**id** | **Long** | | [optional]
**username** | **String** | | [optional]
**firstName** | **String** | | [optional]
**lastName** | **String** | | [optional]
**email** | **String** | | [optional]
**password** | **String** | | [optional]
**phone** | **String** | | [optional]
**userStatus** | **Integer** | User Status | [optional]