Commit Graph

726 Commits

Author SHA1 Message Date
1debb888c2 Merge pull request 'xbx' (#54) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/54
2020-10-19 09:00:23 +08:00
13258c990c
Merge branch 'zj' of http://git.luyuan.tk/luyuan/beelink into xbx 2020-10-19 08:59:37 +08:00
c3e33c70b5
修正了分页 2020-10-19 08:59:04 +08:00
asd
01ca0f10c8 Merge pull request '万恶的语言哦' (#53) from zj into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/53
2020-10-17 17:32:59 +08:00
asd
063975a818 万恶的语言哦 2020-10-17 17:31:25 +08:00
ce3104abce
Merge branch 'master' of http://git.luyuan.tk/luyuan/beelink into xbx 2020-10-16 19:35:29 +08:00
asd
0f3c81499d Merge pull request '个人档案修改' (#52) from zj into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/52
2020-10-16 19:14:15 +08:00
asd
41009afeec 个人档案修改 2020-10-16 19:12:57 +08:00
2dc82c8000
月日历完成 2020-10-16 16:22:21 +08:00
9db63a6a1d Merge pull request 'xbx' (#51) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/51
2020-10-16 14:53:54 +08:00
8f3eb66639
Merge branch 'master' of http://git.luyuan.tk/luyuan/beelink into xbx 2020-10-16 14:53:37 +08:00
b9f4d755a0
分页 2020-10-16 14:52:21 +08:00
1a9dd0ba50
日历接口调整 2020-10-16 14:47:35 +08:00
asd
6df114aece Merge pull request 'zj' (#50) from zj into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/50
2020-10-16 14:33:39 +08:00
b5cbd71a56
Merge branch 'zj' of http://git.luyuan.tk/luyuan/beelink into xbx 2020-10-16 14:33:26 +08:00
7808cac24d Merge pull request 'xbx' (#49) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/49
2020-10-16 14:33:13 +08:00
asd
27e4a2570e Merge branch 'master' of http://git.luyuan.tk/luyuan/beelink into zj 2020-10-16 14:32:15 +08:00
asd
3f1085f664 订阅者 2020-10-16 14:31:39 +08:00
007cf5a9c7
直播切换 2020-10-16 14:31:32 +08:00
758f85facf
直播学生 2020-10-16 10:47:05 +08:00
asd
f7d4f86541 Merge pull request 'zj' (#48) from zj into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/48
2020-10-16 09:36:28 +08:00
eef4917466
Merge branch 'zj' of http://git.luyuan.tk/luyuan/beelink into xbx 2020-10-16 09:35:44 +08:00
bfcf22b479
直播一部分 2020-10-16 09:34:55 +08:00
ad1c54fdc9
日历修改 2020-10-16 08:59:17 +08:00
asd
9a6eeff200 钱包 获取成功id 2020-10-15 20:12:21 +08:00
7bf5fc86de
添加跳转日历 2020-10-15 19:33:11 +08:00
79a5882601
替换了4个空格缩进 2020-10-15 19:23:34 +08:00
6102fda7de
一部分接口 2020-10-15 19:06:30 +08:00
9c0e6ffd39
发布视频 2020-10-15 16:17:39 +08:00
asd
4824480b5b Merge branch 'master' of http://git.luyuan.tk/luyuan/beelink into zj 2020-10-15 15:45:23 +08:00
asd
19cd11b0dc 钱包 2020-10-15 15:44:50 +08:00
f58ccbb11d Merge pull request 'xbx' (#47) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/47
2020-10-15 15:44:23 +08:00
73f0232af1
修改了手机号 2020-10-15 15:43:55 +08:00
b1649cf566
直播修改 2020-10-15 15:34:14 +08:00
6111abafc4
直播 2020-10-15 14:51:34 +08:00
b92d59b01d Merge pull request 'xbx' (#46) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/46
2020-10-15 09:22:40 +08:00
c240c7aba3
添加了put方法 2020-10-15 09:21:00 +08:00
6bf0fbc16f
video样式 2020-10-15 09:14:23 +08:00
7a821adee5
Merge branch 'master' of http://git.luyuan.tk/luyuan/beelink into xbx 2020-10-14 18:55:57 +08:00
ffe57d9938
上传文件 2020-10-14 18:55:15 +08:00
asd
397e7b8f36 Merge pull request 'zj' (#45) from zj into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/45
2020-10-14 18:53:55 +08:00
asd
a341593ba6 fin 2020-10-14 18:52:50 +08:00
asd
edc7242f3f Merge branch 'master' of http://git.luyuan.tk/luyuan/beelink into zj 2020-10-14 16:27:46 +08:00
asd
f9066bcdf1 视频详情 2020-10-14 16:27:24 +08:00
e23b1ba7f7 Merge pull request '出现tokne自动切登录' (#44) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/44
2020-10-14 16:22:07 +08:00
b41672ce8b
出现tokne自动切登录 2020-10-14 16:21:40 +08:00
8703d9b303 Merge pull request '删除' (#43) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/43
2020-10-14 15:36:29 +08:00
5832f7a0bc
删除 2020-10-14 15:36:13 +08:00
5fb97c7c78 Merge pull request '添加del方法' (#42) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/42
2020-10-14 15:34:10 +08:00
4b095a853c
添加del方法 2020-10-14 15:33:46 +08:00