Commit Graph

545 Commits

Author SHA1 Message Date
45079580d4 Merge pull request 'zhy' (#8) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/8
2020-06-02 16:09:50 +08:00
0a6766f653 6.2 2020-06-02 16:08:35 +08:00
cf16d0750f Merge pull request 'v' (#9) from zmr into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/9
2020-06-02 16:03:14 +08:00
19dba0cd67 Merge branch 'master' into zmr 2020-06-02 16:03:09 +08:00
zmr900709
14dec1fd04 v 2020-06-02 15:59:01 +08:00
4e989fc1c0
. 2020-06-02 15:53:33 +08:00
ba1db0eb05
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-06-02 15:37:04 +08:00
c02c1bef74
首页基本完成 2020-06-02 15:37:01 +08:00
640948442b Merge pull request 'zmr' (#7) from zmr into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/7
2020-06-02 15:35:36 +08:00
5b36365a76 6.2 2020-06-02 15:35:19 +08:00
zmr900709
abb23e3089 v 2020-06-02 15:35:03 +08:00
zmr900709
9bf8ed444f v 2020-06-02 12:01:13 +08:00
04855a770c 6.2 2020-06-02 11:42:13 +08:00
963dc86404 Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zhy 2020-06-02 11:41:33 +08:00
zmr900709
7856c25009 v 2020-06-02 11:40:14 +08:00
35799b3325 Merge pull request 'xbx' (#6) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/6
2020-06-02 11:35:41 +08:00
885d15331e
Merge branch 'xbx' of http://git.luyuan.tk/luyuan/deming into xbx 2020-06-02 11:35:24 +08:00
f913563727 Merge branch 'master' into xbx 2020-06-02 11:35:13 +08:00
abc463f59d
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-06-02 11:35:04 +08:00
2d212ec8d2
引入了uview 2020-06-02 11:34:09 +08:00
c3f438a79a
添加组建库 2020-06-02 11:29:31 +08:00
7eda034834 Merge pull request 'xbx' (#5) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/5
2020-06-02 11:15:36 +08:00
90b5103bd2
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-06-02 11:15:09 +08:00
af1e4ff55b
推荐+readme 2020-06-02 11:14:51 +08:00
c9b0e64198 Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zhy 2020-06-02 09:48:21 +08:00
0f5e209d64
直播页面 2020-06-02 09:34:37 +08:00
zmr900709
b6b74ae331 login 2020-06-02 09:27:35 +08:00
c312152365
推荐完成 2020-06-02 09:16:41 +08:00
023072afb0 Merge pull request 'xbx' (#4) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/4
2020-06-02 09:00:29 +08:00
15730b8506
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-06-02 09:00:12 +08:00
14e93665da
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-06-02 08:57:57 +08:00
zmr900709
cb8eb90c15 登录页页添加 2020-06-02 08:49:13 +08:00
4e8bdc6522
首页一部分 2020-06-02 08:47:57 +08:00
6e3c8aa767 Merge pull request 'master' (#3) from master into zhy
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/3
2020-06-01 16:53:05 +08:00
a6abca1d4b 6.1 2020-06-01 16:51:11 +08:00
1768131253 Merge pull request 'fist' (#2) from zmr into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/2
2020-06-01 11:52:40 +08:00
zmr900709
d9ecf2144c merge master 2020-06-01 11:52:29 +08:00
zmr900709
2a27b13f90 fist 2020-06-01 11:41:09 +08:00
03442440cc Merge pull request '5.29' (#1) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/1
2020-05-29 17:19:49 +08:00
db2b9d8e25 5.29 2020-05-29 17:10:25 +08:00
7d86d2c74a readme 2020-05-29 11:30:59 +08:00
e2a98bd370 readme 2020-05-29 11:28:55 +08:00
17fbae9544 readme 2020-05-29 11:27:52 +08:00
a187d5bc97 忽略文件 2020-05-29 11:19:24 +08:00
53596b2be1 first commit 2020-05-29 11:13:55 +08:00