Commit Graph

486 Commits

Author SHA1 Message Date
39b2749ac9 Merge pull request 'zhy' (#150) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/150
2020-08-11 10:23:43 +08:00
c01470b52d fixing bug 8.11 2020-08-11 10:23:04 +08:00
6e900dcd3b Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zhy 2020-08-11 10:10:13 +08:00
7956517c4a solve bug 8.11 2020-08-11 10:06:51 +08:00
gyh
43e15cc4a7 Merge pull request 'gdpao' (#149) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/149
2020-08-11 10:04:46 +08:00
Gdpao
e1c908152a gdpao 2020-08-11 10:04:25 +08:00
Gdpao
aad2bca5c6 gdpao 2020-08-11 10:00:06 +08:00
f79db4aa62 Merge pull request 'fixed bug 8.11' (#147) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/147
2020-08-11 09:46:49 +08:00
4739ef71a9 fixed bug 8.11 2020-08-11 09:46:05 +08:00
a22b3fba71
图片 2020-08-11 09:36:03 +08:00
gyh
003bc07c6b Merge pull request 'gdpao' (#146) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/146
2020-08-10 19:19:54 +08:00
Gdpao
e6f73f01cd gdpao 2020-08-10 19:19:29 +08:00
gyh
52bce327cc Merge pull request 'gdpaoup' (#145) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/145
2020-08-10 19:08:19 +08:00
Gdpao
74fcc50696 gdpaoup 2020-08-10 19:06:47 +08:00
33b0137c06 Merge pull request 'zhy' (#144) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/144
2020-08-10 17:47:31 +08:00
7c05459daf send wash 8.9 2020-08-10 17:46:57 +08:00
610d012e67 Merge pull request 'xbx' (#143) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/143
2020-08-10 17:39:14 +08:00
8c3121d5ed new member 8.9 2020-08-10 17:38:54 +08:00
8df5bc2701
状态 2020-08-10 17:30:41 +08:00
0c8e81f484
跳转提示 2020-08-10 17:03:15 +08:00
e3407b1046
关注跳转 2020-08-10 16:55:45 +08:00
55297a6587
消息 2020-08-10 10:41:13 +08:00
52508a1098
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-08-10 08:53:11 +08:00
22a67d23c4
out 2020-08-10 08:52:33 +08:00
gyh
39466d3360 Merge pull request 'gdpao' (#142) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/142
2020-08-09 19:11:25 +08:00
Gdpao
2e95172a75 upct 2020-08-09 19:11:12 +08:00
Gdpao
234f11eeef gdpao 2020-08-09 19:08:12 +08:00
8b6bf2da03 Merge pull request 'serach input 8.9' (#141) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/141
2020-08-09 19:07:20 +08:00
520fa5497c serach input 8.9 2020-08-09 19:06:54 +08:00
9a4e4f5efe Merge pull request 'bug 8.9' (#140) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/140
2020-08-09 18:40:07 +08:00
9b93b6a5a9 bug 8.9 2020-08-09 18:39:35 +08:00
199a1d3d96 Merge pull request '搜索完成' (#139) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/139
2020-08-09 18:37:02 +08:00
b9b9a8e829
搜索完成 2020-08-09 18:29:36 +08:00
d00b4a75ac Merge pull request 'specil 8.9' (#138) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/138
2020-08-09 14:24:30 +08:00
9631e9f827 specil 8.9 2020-08-09 14:23:59 +08:00
gyh
097f7e3cba Merge pull request 'gdpao' (#137) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/137
2020-08-09 11:33:25 +08:00
Gdpao
fe8af80983 gdpao 2020-08-09 11:31:47 +08:00
a9098c3156 Merge pull request 'spec 8.9' (#136) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/136
2020-08-09 11:27:55 +08:00
228e34d8fc spec 8.9 2020-08-09 11:27:15 +08:00
e5a322fd35 Merge pull request 'spike time 8.8' (#135) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/135
2020-08-08 18:15:45 +08:00
cef9296a78 spike time 8.8 2020-08-08 18:15:07 +08:00
f32f7df14a Merge pull request 'xbx' (#134) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/134
2020-08-08 17:31:42 +08:00
817c886d84 Merge branch 'master' into xbx 2020-08-08 17:31:25 +08:00
5abe5620f5
勉强解决 2020-08-08 16:14:25 +08:00
9e96eeb575
成功 2020-08-08 15:40:48 +08:00
6d6b1648bc Merge pull request 'group buy 8.8' (#133) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/133
2020-08-08 12:08:37 +08:00
02702bc447 group buy 8.8 2020-08-08 12:07:50 +08:00
gyh
1ee0dd4b25 Merge pull request 'gdpao' (#132) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/132
2020-08-07 20:00:14 +08:00
Gdpao
0290189205 gdpaomg 2020-08-07 19:59:51 +08:00
Gdpao
502e020000 gdpao 2020-08-07 19:56:47 +08:00