Commit Graph

109 Commits

Author SHA1 Message Date
Gdpao
cc934696d1 gdpaoup 2020-08-04 19:46:42 +08:00
Gdpao
afc7731781 gdpao 2020-08-04 19:39:31 +08:00
1f9299602e Merge pull request 'classify 8.4' (#110) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/110
2020-08-04 19:10:00 +08:00
2fd62acb73 classify 8.4 2020-08-04 19:08:04 +08:00
gyh
f69a82ace5 Merge pull request 'gdpaoup' (#109) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/109
2020-08-04 14:38:17 +08:00
Gdpao
1f5af9d92b gdpaoup 2020-08-04 14:36:35 +08:00
e354152beb
人数 2020-08-04 11:43:33 +08:00
20b1c0da43 Merge branch 'master' into xbx 2020-08-04 10:42:38 +08:00
35e0c39d1d
rid 2020-08-04 10:41:54 +08:00
715793414f Merge pull request 'time none8.3' (#105) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/105
2020-08-03 21:00:41 +08:00
0a52842e35 time none8.3 2020-08-03 20:59:24 +08:00
gyh
0ee518854c Merge pull request 'gdpaoup2' (#104) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/104
2020-08-03 19:52:53 +08:00
Gdpao
38f92c6766 gdpaoup2 2020-08-03 19:51:05 +08:00
95f893a277
kuandu 2020-08-03 19:50:56 +08:00
b070a559dc
直播 2020-08-03 15:56:51 +08:00
0bc6be9b9f Merge pull request 'z8.3' (#100) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/100
2020-08-03 14:39:38 +08:00
Gdpao
51cd6f8261 gdpaoup 2020-08-03 14:37:02 +08:00
af768bff80 z8.3 2020-08-03 14:34:56 +08:00
gyh
c118eced7f Merge pull request 'gdpao' (#98) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/98
2020-08-03 14:31:20 +08:00
Gdpao
11865d4068 gdpao 2020-08-03 14:26:52 +08:00
8727ae913d
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-08-03 10:35:41 +08:00
1da6974fe3
直播 2020-08-03 10:34:06 +08:00
bd996de410
goeasy 2020-08-03 09:05:30 +08:00
gyh
7ae10c200d Merge pull request 'gdpao' (#96) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/96
2020-08-01 17:24:12 +08:00
Gdpao
8a213ba094 gdpao 2020-08-01 17:22:46 +08:00
854976c8f0 comment 8.1 2020-08-01 16:36:48 +08:00
48722ef768 Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zhy 2020-07-31 21:49:05 +08:00
ff7c6b358d order comment 7.31 2020-07-31 21:47:41 +08:00
Gdpao
ea10c99cd1 gdpao 2020-07-31 09:59:22 +08:00
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
Gdpao
d817d0c28b gyh change 2020-07-31 08:45:30 +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