Commit 3f5c16a69d225b521dce7a3ddd564d2e40ae0c80
Exists in
master
Merge branch 'master' of http://git.shunzhi.net/kagami/publicdoc
# Conflicts: # ShuRenZhiDaoWEBAPI
Showing
1 changed file
with
9 additions
and
0 deletions
Show diff stats
ShuRenZhiDaoWEBAPI
| ... | ... | @@ -206,6 +206,15 @@ |
| 206 | 206 | 返回:是否发表成功 |
| 207 | 207 | 4.5我的钱包接口 |
| 208 | 208 | 权限:当前登录账号 |
| 209 | +<<<<<<< HEAD | |
| 209 | 210 | 参数:分页 |
| 210 | 211 | 返回:购买记录 |
| 211 | 212 | |
| 213 | +======= | |
| 214 | + 参数:用户id | |
| 215 | + 返回:已购买全部课程列表 | |
| 216 | + 4.6我的课程接口 | |
| 217 | + 权限:当前登录账号 | |
| 218 | + 参数:用户id | |
| 219 | + 返回:全部课程列表 | |
| 220 | +>>>>>>> ed73611a6957b0eb814adbb1b92a533c835dce30 | ... | ... |