Commit Graph

79 Commits

Author SHA1 Message Date
2ec14481fd
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-07-31 09:40:18 +08:00
b9b8384011
修正错误 2020-07-31 09:40:06 +08:00
6d00107944 adv 7.30 2020-07-30 20:33:16 +08:00
120e062fcd send wash 7.29 2020-07-29 19:01:10 +08:00
ee08038a64
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-07-28 20:49:21 +08:00
b12a3c1722 send 7.28 2020-07-28 20:47:31 +08:00
4004f3715b
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-07-27 18:02:22 +08:00
2ea9b89acc
直播 2020-07-27 17:32:17 +08:00
b2d284f666
直播列表 2020-07-27 14:35:32 +08:00
185f5979b6 order 7.25 2020-07-25 17:51:01 +08:00
5abb3f2496 comment 7.24 2020-07-24 20:35:28 +08:00
dd71a0f32a comment 7.2 2020-07-24 19:48:57 +08:00
59362ebc7c loadmore 7.23 2020-07-23 20:58:56 +08:00
be9f2ec1c7 order 7.23 2020-07-23 14:56:20 +08:00
03d10b1749 Merge branch 'master' into xbx 2020-07-21 21:03:56 +08:00
c89099f686 order 2020-07-21 21:02:28 +08:00
78769b8583
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-07-20 17:30:36 +08:00
e6ddb3c5df Merge pull request 'v' (#72) from zmr into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/72
2020-07-20 17:22:47 +08:00
a6e1241238 group order 2020-07-20 17:17:41 +08:00
zmr900709
2a62b100fb v 2020-07-20 17:14:18 +08:00
ef7c81201b
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-07-20 08:45:02 +08:00
zmr900709
687387861f Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zmr 2020-07-18 19:53:16 +08:00
zmr900709
30b99968db tian jia guan zhu 2020-07-18 19:52:47 +08:00
5c9bdcd0f3 完善问题 2020-07-18 17:43:37 +08:00
113144b716
添加了获取直播列表的接口 2020-07-18 16:10:14 +08:00
zmr900709
e34c74c303 Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zmr 2020-07-18 14:06:01 +08:00
zmr900709
c90b2c3912 v 2020-07-18 14:05:37 +08:00
7b9479d56c coupon 2020-07-17 17:34:42 +08:00
5a4e302899 Merge pull request 'zmr' (#66) from zmr into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/66
2020-07-17 08:42:58 +08:00
zmr900709
750ff19690 shouye xiugai 2020-07-17 08:36:53 +08:00
b250d05adf 7.16 2020-07-16 17:39:06 +08:00
91241682de 7.15 2020-07-15 17:38:41 +08:00
cc9fb2b48b 7.15 2020-07-15 16:21:43 +08:00
b83b375945 retrieve file 2020-07-14 10:13:27 +08:00
zmr900709
2479d587cd Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zmr 2020-07-11 15:42:05 +08:00
73ffe92169
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-07-10 15:57:28 +08:00
a5b83f31a8 upload file 2020-07-10 09:03:19 +08:00
zmr900709
699b94e472 Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zmr 2020-07-09 16:35:37 +08:00
zmr900709
10bbccc2bd v 2020-07-09 16:35:23 +08:00
9ffdfa652a api 2020-07-08 18:14:41 +08:00
aea71b6354
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-07-08 08:44:11 +08:00
396e795943
搜索修改 2020-07-08 08:43:39 +08:00
5ede514a02 api 2020-07-07 17:47:00 +08:00
8dc45b57fd api 2020-07-06 17:32:29 +08:00
f27d08c224 api 2020-07-03 17:44:58 +08:00
19b1dad0a8
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-07-03 09:10:40 +08:00
98efaa4352
某些页面修改 2020-07-03 09:09:21 +08:00
8e7da400ac api 2020-07-03 09:08:53 +08:00
dc72f79ee8 api 2020-07-01 17:32:36 +08:00
dc69746320 api 2020-06-30 18:06:50 +08:00