Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
N
newShopBack
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
newshop
newShopBack
Commits
bb4c7465
Commit
bb4c7465
authored
Nov 13, 2019
by
郭勇志
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'development' of
http://gitlab-ebiz.yiyao365.cn/newshop/newshopback
into development
parents
0cbcef77
a15f2bf5
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
main.php
backend/config/main.php
+2
-2
UserComplainController.php
backend/controllers/v1/shopuser/UserComplainController.php
+1
-1
UserDepartmentController.php
backend/controllers/v1/shopuser/UserDepartmentController.php
+2
-2
No files found.
backend/config/main.php
View file @
bb4c7465
...
@@ -62,8 +62,8 @@ return [
...
@@ -62,8 +62,8 @@ return [
'GET,OPTIONS test'
=>
'test'
,
'GET,OPTIONS test'
=>
'test'
,
'GET swagger'
=>
'swagger'
,
'GET swagger'
=>
'swagger'
,
'POST login'
=>
'login'
,
'POST login'
=>
'login'
,
'GET department'
=>
'department'
,
'GET
,OPTIONS
department'
=>
'department'
,
'GET user-complain'
=>
'user-complain'
,
'GET
,OPTIONS
user-complain'
=>
'user-complain'
,
'GET employee-info'
=>
'employee-info'
,
'GET employee-info'
=>
'employee-info'
,
'GET employee-list'
=>
'employee-list'
,
'GET employee-list'
=>
'employee-list'
,
],
],
...
...
backend/controllers/v1/shopuser/UserComplainController.php
View file @
bb4c7465
...
@@ -21,7 +21,7 @@ class UserComplainController extends BaseController
...
@@ -21,7 +21,7 @@ class UserComplainController extends BaseController
* description="留言信息列表",
* description="留言信息列表",
* summary="留言信息列表(孙磊)",
* summary="留言信息列表(孙磊)",
* operationId="UserComplain",
* operationId="UserComplain",
* @OA\Parameter(name="phone",in="query",@OA\Schema(type="string")),
* @OA\Parameter(name="phone",in="query",
description="用户电话",
@OA\Schema(type="string")),
* @OA\Response(response="200",description="OK。一切正常"),
* @OA\Response(response="200",description="OK。一切正常"),
* security={{"Authorization": {}}}
* security={{"Authorization": {}}}
* )
* )
...
...
backend/controllers/v1/shopuser/UserDepartmentController.php
View file @
bb4c7465
...
@@ -21,8 +21,8 @@ class UserDepartmentController extends BaseController
...
@@ -21,8 +21,8 @@ class UserDepartmentController extends BaseController
* description="部门信息列表",
* description="部门信息列表",
* summary="部门信息列表(孙磊)",
* summary="部门信息列表(孙磊)",
* operationId="Department",
* operationId="Department",
* @OA\Parameter(name="code",in="query",@OA\Schema(type="string")),
* @OA\Parameter(name="code",in="query",
description="部门编号",
@OA\Schema(type="string")),
* @OA\Parameter(name="name",in="query",@OA\Schema(type="string")),
* @OA\Parameter(name="name",in="query",
description="部门名称",
@OA\Schema(type="string")),
* @OA\Response(response="200",description="OK。一切正常"),
* @OA\Response(response="200",description="OK。一切正常"),
* security={{"Authorization": {}}}
* security={{"Authorization": {}}}
* )
* )
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment