Commit Graph

325 Commits

Author SHA1 Message Date
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
185f5979b6 order 7.25 2020-07-25 17:51:01 +08:00
410a7850e6 Merge pull request 'order 7.25' (#81) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/81
2020-07-25 15:18:30 +08:00
c931e87209 order 7.25 2020-07-25 15:17:52 +08:00
94636380f1 Merge pull request 'comment 7.24' (#80) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/80
2020-07-24 20:36:00 +08:00
5abb3f2496 comment 7.24 2020-07-24 20:35:28 +08:00
a1b14b4f5e Merge pull request 'comment 7.24' (#79) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/79
2020-07-24 19:50:24 +08:00
dd71a0f32a comment 7.2 2020-07-24 19:48:57 +08:00
4196f545fd Merge pull request 'loadmore 7.23' (#78) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/78
2020-07-23 20:59:36 +08:00
59362ebc7c loadmore 7.23 2020-07-23 20:58:56 +08:00
937640f19d Merge pull request 'order 7.23' (#77) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/77
2020-07-23 14:57:42 +08:00
be9f2ec1c7 order 7.23 2020-07-23 14:56:20 +08:00
2e087313d4 Merge pull request 'order 7.22' (#76) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/76
2020-07-22 18:52:49 +08:00
818d388f31 order 7.22 2020-07-22 18:51:48 +08:00
bd604ecec7 Merge pull request 'xbx' (#75) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/75
2020-07-21 21:04:01 +08:00
03d10b1749 Merge branch 'master' into xbx 2020-07-21 21:03:56 +08:00
50c0ac55e6 Merge pull request 'order' (#74) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/74
2020-07-21 21:03:13 +08:00
c89099f686 order 2020-07-21 21:02:28 +08:00
063da7bef3
商家部分 2020-07-21 21:01:42 +08:00
c96f5ca95d
1 2020-07-21 20:40:12 +08:00
78769b8583
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-07-20 17:30:36 +08:00
864f43e200 Merge pull request 'update coupon height' (#73) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/73
2020-07-20 17:29:07 +08:00
86686ef1a6 update coupon height 2020-07-20 17:28:37 +08:00