Commit Graph

447 Commits

Author SHA1 Message Date
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
a0cb2a668e Merge pull request '修改' (#131) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/131
2020-08-07 18:05:02 +08:00
597c92e9cd Merge branch 'master' into xbx 2020-08-07 18:04:49 +08:00
07e1661a18
修改 2020-08-07 18:03:40 +08:00
26254aba84 Merge pull request 'xbx' (#130) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/130
2020-08-07 18:02:10 +08:00
6bf4fdc7e3
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-08-07 18:01:40 +08:00
6eeebf25c0
清空消息 2020-08-07 17:37:23 +08:00
83e57ceea6 Merge pull request 'rewrite tab swiper 8.7' (#129) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/129
2020-08-07 17:36:56 +08:00
9d3f8da629 rewrite tab swiper 8.7 2020-08-07 17:34:59 +08:00
93dbdca573
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-08-07 17:10:29 +08:00
57fcf69974
聊天完成 2020-08-07 16:54:54 +08:00
f4313dce9d
md5 2020-08-07 14:39:15 +08:00
f4ba942870 Merge pull request 'collect 8.7' (#128) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/128
2020-08-07 11:59:47 +08:00
a088c895d2 collect 8.7 2020-08-07 11:59:08 +08:00
fc86ad2579
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-08-07 11:41:03 +08:00
eb0d648f6a
完成 2020-08-07 11:40:13 +08:00
gyh
71e984b2ed Merge pull request 'gdpaoup' (#127) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/127
2020-08-06 20:46:53 +08:00
Gdpao
2afd55f79e gdpaomg 2020-08-06 20:46:40 +08:00
Gdpao
090b7cc753 gdpaoup 2020-08-06 20:42:03 +08:00
c56743765c Merge pull request 'upgrade 8.6' (#126) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/126
2020-08-06 17:53:11 +08:00
1a1a0de460 upgrade 8.6 2020-08-06 17:52:25 +08:00
24410d0ee7 Merge pull request 'xbx' (#125) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/125
2020-08-06 16:25:31 +08:00
9f444ad070
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-08-06 16:24:49 +08:00
e11f20885f
完成 2020-08-06 16:22:40 +08:00
e6b7b50a1e
聊天本地缓存 2020-08-06 15:57:56 +08:00
201f858833 Merge pull request 'refund 8.6' (#124) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/124
2020-08-06 10:51:00 +08:00
8bf42a75dd Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zhy 2020-08-06 10:50:11 +08:00
9054432b59
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-08-06 10:49:27 +08:00
2c6cdbead9
Merge branch 'zhy' of http://git.luyuan.tk/luyuan/deming into xbx 2020-08-06 10:48:46 +08:00
2cb8f90281 refund 8.6 2020-08-06 10:48:21 +08:00
79d8f91769 Merge pull request 'xbx' (#123) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/123
2020-08-06 10:48:03 +08:00
2a8ee65a94
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-08-06 10:45:18 +08:00
9872770472
Merge branch 'zmr' of http://git.luyuan.tk/luyuan/deming into xbx 2020-08-06 10:45:03 +08:00
7a7b126fe3
聊天 2020-08-06 10:40:26 +08:00
gyh
b158080eb7 Merge pull request 'gdpaoup' (#122) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/122
2020-08-06 10:37:14 +08:00
Gdpao
046f2e50c5 gdpaoup 2020-08-06 10:35:59 +08:00
Niujiawei
1313a90d5e 修改样式 2020-08-05 22:44:08 +08:00
Niujiawei
ed0edbab2f 修改样式 2020.08.05 2020-08-05 22:06:09 +08:00
Niujiawei
361e9a76fd 修改样式等相关文件 2020-08-05 21:39:02 +08:00
gyh
720af35b11 Merge pull request 'gdpaoup' (#120) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/120
2020-08-05 21:11:49 +08:00