Commit Graph

290 Commits

Author SHA1 Message Date
fb81800253
涉黄提示 2020-09-11 20:23:34 +08:00
1f6d2b4ab3
删除了派送方式 2020-09-11 20:03:26 +08:00
52277be0c9
Merge branch 'master' of http://git.luyuan.tk/luyuan/demingshangjia into xbx 2020-09-11 19:46:31 +08:00
391fda5abc
修改了选择 2020-09-11 19:46:19 +08:00
f770b05dcd Merge pull request '修改了热度 => 观看人数' (#98) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/98
2020-09-11 16:46:32 +08:00
6d3d176cd8
修改了热度 => 观看人数 2020-09-11 16:43:54 +08:00
gyh
909082f7ca Merge pull request 'gdpao' (#97) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/97
2020-09-11 15:37:57 +08:00
Gdpao
dadb891236 gdpao 2020-09-11 15:25:57 +08:00
42e3c7d6a7 Merge pull request 'xbx' (#96) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/96
2020-09-10 17:21:57 +08:00
8434b1e611
不变型 2020-09-10 17:21:26 +08:00
a0ccf26c99
member_id 2020-09-10 17:13:40 +08:00
gyh
541d8f9f6e Merge pull request 'gdzb' (#95) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/95
2020-09-10 16:14:22 +08:00
5f56b7a27c Merge pull request 'xbx' (#94) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/94
2020-09-10 16:01:29 +08:00
0c41f85630
修复 2020-09-10 16:01:16 +08:00
0087c0c3cd
修复了层次 2020-09-10 15:58:54 +08:00
Gdpao
c270f238bd gdzb 2020-09-10 14:48:17 +08:00
5add00c60a Merge pull request 'xbx' (#93) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/93
2020-09-10 11:38:51 +08:00
c236af5986
删除 2020-09-10 11:38:33 +08:00
d86dc49da2
修改了标题提示 2020-09-10 11:37:37 +08:00
4c8309ca66
Merge branch 'master' of http://git.luyuan.tk/luyuan/demingshangjia into xbx 2020-09-10 10:05:18 +08:00
e173f3c2a8
Merge branch 'xbx' of http://git.luyuan.tk/luyuan/demingshangjia into xbx 2020-09-10 10:05:14 +08:00
d0107c5729
临时修复了提示 2020-09-10 10:05:04 +08:00
gyh
1309fec9c3 Merge pull request 'gyh' (#92) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/92
2020-09-10 09:58:33 +08:00
b2d7ae4ec5
临时修复了提示 2020-09-10 09:27:12 +08:00
Gdpao
75e02e0228 gdpao 2020-09-10 09:20:30 +08:00
Gdpao
3e8caffe19 gdpaoup 2020-09-07 17:10:24 +08:00
gyh
571489743a Merge pull request 'gdpao' (#91) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/91
2020-09-07 16:22:45 +08:00
Gdpao
f7f3fee4ad gdpao 2020-09-07 16:22:11 +08:00
gyh
1f70d8dfcb Merge pull request 'gdpaoup' (#90) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/90
2020-09-05 20:05:02 +08:00
Gdpao
8c89864beb gdpaoup 2020-09-05 17:22:53 +08:00
gyh
af908a3dda Merge pull request 'gdpao' (#89) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/89
2020-09-05 15:32:35 +08:00
9ee97373bc Merge pull request 'xbx' (#88) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/88
2020-09-05 15:28:45 +08:00
Gdpao
388daaa901 gdpao 2020-09-05 12:30:22 +08:00
0f85f77520
添加了一个输出 2020-09-05 12:18:05 +08:00
23916ea7fa
解决了划走之后的问题 2020-09-05 12:09:57 +08:00
gyh
539309b370 Merge pull request 'GDPAO' (#87) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/87
2020-09-04 19:53:27 +08:00
Gdpao
0824d97080 GDPAO 2020-09-04 19:52:43 +08:00
b98baa39aa Merge pull request '文案' (#86) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/86
2020-09-03 18:08:38 +08:00
0619bbd901
文案 2020-09-03 18:08:10 +08:00
60cb9294fc Merge pull request '添加了强制重新渲染' (#85) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/85
2020-09-03 11:45:18 +08:00
cd89acf38c
添加了强制重新渲染 2020-09-03 11:44:16 +08:00
gyh
c4114bcfc5 Merge pull request 'gdpao' (#84) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/84
2020-09-03 10:27:40 +08:00
Gdpao
f2e3427260 gdpao 2020-09-03 10:26:55 +08:00
gyh
dbf18d4091 Merge pull request 'gdpao' (#83) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/83
2020-09-02 14:52:12 +08:00
Gdpao
7d066ca67d gdpao 2020-09-02 14:05:08 +08:00
gyh
22901579b9 Merge pull request 'gdpao' (#82) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/82
2020-09-01 20:36:06 +08:00
Gdpao
3ecaac3190 gdpaomg 2020-09-01 20:35:48 +08:00
Gdpao
c5b3505dcd gdpao 2020-09-01 20:32:15 +08:00
b9eceb6ecf Merge pull request '添加了购买人数' (#81) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/81
2020-09-01 17:33:52 +08:00
2bdd8e2b7f
添加了购买人数 2020-09-01 16:59:55 +08:00