Commit Graph

358 Commits

Author SHA1 Message Date
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
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
Gdpao
1b5bf33166 gdpaomg 2020-08-05 21:11:32 +08:00
Gdpao
c4c11781fb gdpaoup 2020-08-05 21:06:29 +08:00
e1519b8d68 Merge pull request 'store 8.5' (#119) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/119
2020-08-05 17:40:03 +08:00
0057bcd28e store 8.5 2020-08-05 17:38:11 +08:00
9881ea099d Merge pull request 'xbx' (#118) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/118
2020-08-05 17:01:52 +08:00
b0f224d79b
聊天列表 2020-08-05 17:00:04 +08:00
045f6e6e01
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-08-05 10:47:18 +08:00
09a7dbdf5c
1 2020-08-05 10:47:08 +08:00
gyh
a47238a7a4 Merge pull request 'gdpaoup3' (#117) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/117
2020-08-04 23:14:02 +08:00
Gdpao
0a2441b1a9 gdpaoup3 2020-08-04 23:13:28 +08:00
gyh
c035566fe4 Merge pull request '修改样式2020.0804' (#116) from zmr into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/116
2020-08-04 22:41:58 +08:00
Niujiawei
ef4a4010ff 修改样式2020.0804 2020-08-04 22:34:03 +08:00
gyh
df29f86630 Merge pull request 'gdpaoup2' (#115) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/115
2020-08-04 22:15:29 +08:00
Gdpao
7b9bee2f1e gdpaoup2 2020-08-04 22:13:50 +08:00
gyh
42d39fb4c3 Merge pull request 'gdpaoup' (#114) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/114
2020-08-04 21:50:39 +08:00
Gdpao
6ed05ecf31 gdpaoup 2020-08-04 21:50:12 +08:00
Gdpao
692495f108 gdpaoup 2020-08-04 21:46:52 +08:00
8cd7c3d0a0 Merge pull request 'upgrade 8.4' (#113) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/113
2020-08-04 21:14:42 +08:00
5343196342 upgrade 8.4 2020-08-04 21:13:47 +08:00
dbb7a91330 Merge pull request 'upgrade 9.4' (#112) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/112
2020-08-04 20:11:57 +08:00
fe9a54987e upgrade 8.4 2020-08-04 20:11:45 +08:00
f6c6ffa176 upgrade 8.4 2020-08-04 20:09:21 +08:00
396bb37c94 Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zhy 2020-08-04 20:03:05 +08:00
13bdc08c86 upgrade 9.4 2020-08-04 20:00:58 +08:00
gyh
43845b4810 Merge pull request 'gdpao' (#111) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/111
2020-08-04 19:47:48 +08:00
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
20ba2e4e8f Merge pull request '人数' (#108) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/108
2020-08-04 11:44:41 +08:00
2a946145e9 Merge branch 'master' into xbx 2020-08-04 11:44:28 +08:00
e354152beb
人数 2020-08-04 11:43:33 +08:00
f83048e5c6 Merge pull request 'rid' (#107) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/107
2020-08-04 10:42:49 +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
gyh
1e9f442b7b Merge pull request 'gdpaoup3' (#106) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/106
2020-08-03 21:42:24 +08:00
Gdpao
48b7219954 gdpaoup3 2020-08-03 21:40:22 +08:00