Commit Graph

447 Commits

Author SHA1 Message Date
b146783790
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-08-03 14:42:23 +08:00
335f4c5564
修改顺序 2020-08-03 14:41:49 +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
gyh
0266a556d9 Merge pull request 'gdpaoup' (#99) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/99
2020-08-03 14:38:20 +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
bb4f3b2918 Merge pull request 'xbx' (#97) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/97
2020-08-03 10:36:49 +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
1c16a85e18 Merge pull request '8.1' (#95) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/95
2020-08-01 17:18:21 +08:00
4ef16728f9 8.1 2020-08-01 17:17:37 +08:00
680fa48e85 Merge pull request 'comment 8.1' (#94) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/94
2020-08-01 16:37:27 +08:00
854976c8f0 comment 8.1 2020-08-01 16:36:48 +08:00
gyh
223dd51db7 Merge pull request 'update' (#93) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/93
2020-08-01 11:20:41 +08:00
Gdpao
5b31193750 update 2020-08-01 11:16:53 +08:00
865e2a741a Merge pull request 'order comment 7.31' (#92) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/92
2020-07-31 21:52:01 +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
gyh
c9c7e08a8d Merge pull request 'gyh change' (#90) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/90
2020-07-31 10:08:00 +08:00
Gdpao
f30c4f4922 gdpaoup 2020-07-31 10:07:37 +08:00
Gdpao
ea10c99cd1 gdpao 2020-07-31 09:59:22 +08:00
ba2cab7950 Merge pull request 'xbx' (#91) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/91
2020-07-31 09:41:50 +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
cdd0105acb Merge pull request 'adv 7.30' (#89) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/89
2020-07-30 20:34:06 +08:00
6d00107944 adv 7.30 2020-07-30 20:33:16 +08:00
04adc72d92 Merge pull request 'send wash 7.29' (#88) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/88
2020-07-29 19:01:59 +08:00
120e062fcd send wash 7.29 2020-07-29 19:01:10 +08:00
gyh
2851c8e0b2 Merge pull request 'gyhup' (#87) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/87
2020-07-29 15:38:31 +08:00
Gdpao
8bb1cdfd39 gyhup 2020-07-29 15:04:57 +08:00
f21df2f107 Merge pull request 'xbx' (#86) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/86
2020-07-28 20:49:57 +08:00
ee08038a64
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-07-28 20:49:21 +08:00
280915560d Merge pull request 'send 7.28' (#85) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/85
2020-07-28 20:48:10 +08:00
41f4050768
直播 2020-07-28 20:47:52 +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
208f27aa93 Merge pull request 'loadmore 7.27' (#84) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/84
2020-07-27 18:01:21 +08:00
6eabd3a575 loadmore 7.27 2020-07-27 17:59:47 +08:00
2ea9b89acc
直播 2020-07-27 17:32:17 +08:00
100f31c6f9 Merge pull request 'lxb' (#83) from lxb into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/83
2020-07-27 14:40:40 +08:00
a3f2a6d57c
删除 2020-07-27 14:36:55 +08:00
b2d284f666
直播列表 2020-07-27 14:35:32 +08:00
lxb
3793c56cdc 1 2020-07-27 09:36:59 +08:00
dbafe8b4c1 Merge pull request 'order 7.25' (#82) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/82
2020-07-25 17:51:40 +08:00