chenxiaojun
|
3d3bfce947
|
自动脚本->玩家角色充值数据统计
|
5 years ago |
“用lww
|
af130fd638
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
“用lww
|
f75188f952
|
后台导出功能增加内存限制到512M
|
5 years ago |
|
chenxiaojun
|
70ee46ab2b
|
自动脚本->玩家角色充值数据统计
|
5 years ago |
|
chenxiaojun
|
855e943ccb
|
自动脚本->玩家角色充值数据统计
|
5 years ago |
|
chenxiaojun
|
05d006d533
|
自动脚本->玩家角色充值数据统计
|
5 years ago |
|
chenxiaojun
|
f2c8986cd7
|
自动脚本->玩家角色充值数据统计
|
5 years ago |
|
“用lww
|
e1b93a987b
|
导出数据过大，配置加大内存限制范围
|
5 years ago |
yulingwei
|
4071341458
|
更新
|
5 years ago |
|
yulingwei
|
090d1e2f69
|
更新bug
|
5 years ago |
tpingzhang
|
a0ab440e1a
|
后台防沉迷配置
|
5 years ago |
|
tpingzhang
|
e8f6e310d1
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
tpingzhang
|
f9307ee710
|
后台防沉迷配置
|
5 years ago |
chenzhi
|
d8fcaf59c5
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
chenzhi
|
8bb10aea61
|
[bug]玩家列表累计充值
|
5 years ago |
|
tpingzhang
|
a77b6d8f04
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
tpingzhang
|
704dd789eb
|
后台防沉迷配置
|
5 years ago |
sunke
|
3cb2f2b479
|
arpu名词说明
|
5 years ago |
|
tpingzhang
|
da794baa96
|
配置写到数据库
|
5 years ago |
|
tpingzhang
|
d176d51c5c
|
配置写到数据库
|
5 years ago |
 elf@home
|
dc6790b404
|
修改
|
5 years ago |
|
sunke
|
2437d613bb
|
bug
|
5 years ago |
|
yulingwei
|
3e423b1372
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
yulingwei
|
342ec9130e
|
修改
|
5 years ago |
|
sunke
|
08707939d5
|
表格字段顺序问题
|
5 years ago |
|
ELF
|
4cfa9c387f
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
ELF
|
ef6b83c867
|
修改bug
|
5 years ago |
|
chenzhi
|
b93b2c59ce
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
chenzhi
|
c76e0620b7
|
[优化 ]新增历史累计充值记录
|
5 years ago |
|
ELF
|
6696889ecb
|
修改bug
|
5 years ago |
|
ELF
|
2f885bcf3e
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
ELF
|
200d9e8667
|
修改bug
|
5 years ago |
zhengyongxing
|
abdf68a91c
|
收回绑币玩家账号select框改为input框
|
5 years ago |
zhengchanglong
|
c6e6f1e713
|
Merge branch 'dev_lww' into dev
|
5 years ago |
|
“用lww
|
4a73f4668d
|
手机官网-落地页回滚
|
5 years ago |
|
yulingwei
|
485e3930f9
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
yulingwei
|
12362190e6
|
upt
|
5 years ago |
|
chenzhi
|
6b7f65be25
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
chenzhi
|
86b53d375c
|
[新增]玩家列表汇总统计
|
5 years ago |
|
sunke
|
94728492e9
|
时间修改
|
5 years ago |
|
zhengchanglong
|
b54f33ea98
|
Merge branch 'dev_lww' into dev
|
5 years ago |
|
chenxiaojun
|
77574b4d37
|
推广平台->数据管理->每日概况|数据汇总--更新
|
5 years ago |
|
chenxiaojun
|
efb4a771b0
|
推广平台->数据管理->每日概况|数据汇总--更新
|
5 years ago |
|
chenzhi
|
0ca7d2f5d2
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
chenzhi
|
ea580a52fe
|
隐藏推广员统计的二级页
|
5 years ago |
|
zhengyongxing
|
12a729444a
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
zhengyongxing
|
ae18f1fb24
|
推广员统计修改
|
5 years ago |
|
sunke
|
9bc0d3516e
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
chenzhi
|
0b0984d266
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
chenzhi
|
b7dd9edaa9
|
[优化]玩家列表累记充值统计
|
5 years ago |
|
sunke
|
21ad2f0341
|
提现状态
|
5 years ago |
|
“用lww
|
3180406491
|
pc官网-公司logo可点击跳首页
|
5 years ago |
|
chenxiaojun
|
0c41644d7a
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
chenxiaojun
|
57709068fa
|
推广平台->财务管理->提现记录--添加撤销提现
|
5 years ago |
|
zhengchanglong
|
b602142a81
|
Merge branch 'dev_lww' into dev
|
5 years ago |
|
chenxiaojun
|
ca2935763b
|
推广平台->财务管理->提现记录--添加撤销提现
|
5 years ago |
|
“用lww
|
1b2a9c7f9b
|
pc官网修改
|
5 years ago |
|
“用lww
|
595c64e831
|
pc官网修改
|
5 years ago |
|
zhengyongxing
|
8e18e8faac
|
推广员统计官方渠道添加
|
5 years ago |
|
sunke
|
1ccf59fa26
|
提现明细状态说明
|
5 years ago |
|
zhengchanglong
|
1ae5fa0f20
|
Merge branch 'dev_lww' into dev
|
5 years ago |
|
sunke
|
63dc4a15d8
|
导出状态修改
|
5 years ago |
|
“用lww
|
6e1db7caa6
|
Merge remote-tracking branch 'origin/dev' into dev_lww
|
5 years ago |
|
“用lww
|
0168a52b68
|
手机官网-页面更改
|
5 years ago |
|
chenxiaojun
|
4a4a6501ce
|
分成比例
|
5 years ago |
|
chenxiaojun
|
e0c0f50c7d
|
分成比例
|
5 years ago |
|
chenxiaojun
|
5fcad13fce
|
根据时间统计玩家充值
|
5 years ago |
|
chenxiaojun
|
2123b29479
|
根据时间统计玩家充值
|
5 years ago |
|
chenzhi
|
df9d1415df
|
[修复]推广员充值统计无promote_id问题
|
5 years ago |
|
sunke
|
0983eb633c
|
设备号
|
5 years ago |
|
sunke
|
b1a870d773
|
排序
|
5 years ago |
|
sunke
|
36ff63bb33
|
角色查询
|
5 years ago |
|
chenxiaojun
|
98fe853743
|
推广平台->数据管理--更新
|
5 years ago |
|
chenxiaojun
|
80f76c4490
|
推广平台->数据管理--更新
|
5 years ago |
|
sunke
|
623bc0d44f
|
充值
|
5 years ago |
|
chenxiaojun
|
67864f82a0
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
chenxiaojun
|
a2dc77645f
|
推广平台->数据管理--更新
|
5 years ago |
|
zhengyongxing
|
0b05701798
|
推广员首页统计修改
|
5 years ago |
|
sunke
|
750cefcb54
|
充值
|
5 years ago |
|
ELF
|
d70bf7bf42
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
ELF
|
0d91f0aa5c
|
修改bug
|
5 years ago |
|
chenxiaojun
|
391b997f18
|
推广平台->财务管理->提现记录--增加重新审核
|
5 years ago |
|
chenxiaojun
|
bd6932d8d4
|
推广平台->财务管理->提现记录--增加重新审核
|
5 years ago |
|
ELF
|
ef9cb4e2c4
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
ELF
|
710d7028f1
|
修改
|
5 years ago |
|
chenxiaojun
|
85eeed62f0
|
推广平台->数据汇总--bug更新
|
5 years ago |
|
chenxiaojun
|
638a206ad6
|
推广平台->数据汇总--bug更新
|
5 years ago |
|
yulingwei
|
8fee02fc4c
|
修改时间
|
5 years ago |
|
chenxiaojun
|
2a93ed6ec2
|
推广平台->数据汇总--bug更新
|
5 years ago |
|
chenxiaojun
|
e24550b993
|
推广平台->数据汇总--bug更新
|
5 years ago |
|
chenxiaojun
|
e8dfa6f92e
|
推广平台->数据汇总--bug更新
|
5 years ago |
|
chenxiaojun
|
c923a58536
|
推广平台->数据汇总--bug更新
|
5 years ago |
|
chenxiaojun
|
9b51fd6145
|
推广平台->数据汇总--bug更新
|
5 years ago |
|
chenxiaojun
|
e7f9d1b6f3
|
推广平台->数据汇总--bug更新
|
5 years ago |
|
sunke
|
ef1857d752
|
bug
|
5 years ago |
|
chenzhi
|
8007d9954f
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
chenzhi
|
849fd77ac6
|
优化推广员统计的方法
|
5 years ago |
|
ELF
|
3ad71f99bf
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
ELF
|
112d7462bc
|
修改bug
|
5 years ago |
|
chenxiaojun
|
950bd81e5e
|
推广平台->数据汇总->充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
47af5037b7
|
推广平台->数据汇总->充值玩家--更新
|
5 years ago |
|
zhengyongxing
|
3cabc6ab95
|
注册修改
|
5 years ago |
|
zhengyongxing
|
d7550495b1
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
zhengyongxing
|
6c2c048952
|
普通注册密码规则修改
|
5 years ago |
|
chenxiaojun
|
4342e240c0
|
推广平台->数据汇总->充值玩家--添加排序功能
|
5 years ago |
|
chenxiaojun
|
1a110770dc
|
推广平台->数据汇总->充值玩家--添加排序功能
|
5 years ago |
|
ELF
|
1c2458841d
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
ELF
|
5a98b86a07
|
修改bug
|
5 years ago |
|
zhengyongxing
|
be09214f7a
|
登录sdk主页跳转
|
5 years ago |
|
zhengyongxing
|
479a7537a8
|
登录sdk主页跳转
|
5 years ago |
|
zhengyongxing
|
ee40286108
|
登录sdk主页跳转
|
5 years ago |
|
zhengchanglong
|
4120344388
|
超级签下载页无礼包不显示礼包特权
|
5 years ago |
|
zhengchanglong
|
7e01b0208c
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
zhengchanglong
|
7265a2961e
|
超级签页面UI修改
|
5 years ago |
|
chenxiaojun
|
3e68880ac0
|
推广平台->数据汇总->充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
09ab8bf8ad
|
推广平台->数据汇总->充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
0571347aeb
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# Application/Home/Controller/QueryController.class.php
|
5 years ago |
|
chenxiaojun
|
d9659ea975
|
推广平台->数据汇总->充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
a53970efcf
|
推广平台->数据汇总->充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
49270427ee
|
推广平台->数据汇总->充值玩家--更新
|
5 years ago |
|
zhengchanglong
|
c63873c171
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
zhengchanglong
|
1ed48003ac
|
超级签充值BUG修复
|
5 years ago |
|
sunke
|
bf3f7f70fa
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
sunke
|
1e090fc6dd
|
时间格式
|
5 years ago |
|
yulingwei
|
0e1abdfa94
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
yulingwei
|
feecf9199d
|
电子邮箱改为选填
|
5 years ago |
|
sunke
|
7220083d84
|
公告
|
5 years ago |
|
zhengyongxing
|
66776fef98
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
zhengyongxing
|
89b67c06a4
|
登录sdk，跳转至购买超级签，无需重新登陆
|
5 years ago |
|
ELF
|
809191e0f2
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
ELF
|
e2a2a07f03
|
修改bug
|
5 years ago |
|
sunke
|
a87eca6363
|
创建时间
|
5 years ago |
|
sunke
|
7610314927
|
数据管理
|
5 years ago |
|
zhengchanglong
|
d191552c1f
|
Merge branch 'dev_zcl' into dev
|
5 years ago |
|
zhengchanglong
|
ddacae349e
|
Merge branch 'dev_lww' into dev_zcl
|
5 years ago |
|
chenzhi
|
8af46f08c2
|
优化推广员统计1
|
5 years ago |
|
zhengchanglong
|
387be649de
|
Merge branch 'dev-cz' into dev
|
5 years ago |
|
chenzhi
|
256545a59a
|
123
|
5 years ago |
|
“用lww
|
019ae56f40
|
手机官网-落地页
|
5 years ago |
|
zhengyongxing
|
5c97bb7610
|
数据分析bug修正
|
5 years ago |
|
zhengyongxing
|
db40381bb1
|
定时器接口时间区间修正
|
5 years ago |
|
sunke
|
401edecd61
|
target_level
|
5 years ago |
|
“用lww
|
07a33ab051
|
手机官网-落地页
|
5 years ago |
|
sunke
|
5241f98c68
|
平台币转移
|
5 years ago |
|
zhengyongxing
|
4f27c2fb29
|
统计bug修正
|
5 years ago |
|
zhengchanglong
|
b7fdcf38f6
|
Merge branch 'dev_zcl' into dev
|
5 years ago |
|
zhengchanglong
|
d230f0e047
|
Merge branch 'dev_zyx' into dev_zcl
|
5 years ago |
|
zhengyongxing
|
08b2ba432a
|
统计数据修正
|
5 years ago |
|
sunke
|
dd7a55bf38
|
账号修改
|
5 years ago |
|
sunke
|
a770dc14e5
|
安全中心
|
5 years ago |
|
sunke
|
e244b43c92
|
推广员账号
|
5 years ago |
|
zhengchanglong
|
b432423068
|
Merge branch 'dev_zcl' into dev
|
5 years ago |
|
zhengchanglong
|
28ab1af0b8
|
Merge branch 'dev-cz' into dev_zcl
|
5 years ago |
|
chenzhi
|
e9e718abbb
|
同上
|
5 years ago |
|
chenzhi
|
0e72821a89
|
修改推广后台平台币充值手续费费率
|
5 years ago |
|
sunke
|
f4bf575663
|
时间格式
|
5 years ago |
|
“用lww
|
28db83f646
|
Merge remote-tracking branch 'origin/dev' into dev_lww
|
5 years ago |
|
sunke
|
bfb236892c
|
提交方式
|
5 years ago |
|
“用lww
|
97543cebb8
|
pc官网-充值页面修改
|
5 years ago |
|
sunke
|
5a83adb06d
|
下载注释
|
5 years ago |
|
sunke
|
193631bbb2
|
大小写问题
|
5 years ago |
|
ELF
|
51d1d730e1
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
ELF
|
c0f19228d2
|
修改bug
|
5 years ago |
|
chenxiaojun
|
925d80ac66
|
管理后台->用户->玩家组->角色查询--更新
|
5 years ago |
|
yulingwei
|
26d0d0d6cb
|
merge
|
5 years ago |
|
chenxiaojun
|
0875ed5a9a
|
管理后台->用户->玩家组->角色查询--更新
|
5 years ago |
|
yulingwei
|
a9f06b1d57
|
修改批量锁定问题
|
5 years ago |
|
zhengchanglong
|
36c4e476ea
|
Merge branch 'dev_zcl' into dev
# Conflicts:
# Data/update.sql
|
5 years ago |
|
zhengchanglong
|
3f869ccb2e
|
Merge branch 'dev-cz' into dev
# Conflicts:
# Data/update.sql
|
5 years ago |
|
chenzhi
|
df03c05651
|
修正统计bug
|
5 years ago |
|
zhengyongxing
|
118f706440
|
脚本去除部分输出
|
5 years ago |
|
zhengchanglong
|
15695d5b5d
|
Merge branch 'dev_zyx' into dev_zcl
# Conflicts:
# Application/Mobile/Controller/SsgController.class.php
|
5 years ago |
|
chenxiaojun
|
0e81ba6401
|
推广平台->数据管理--标题调整
|
5 years ago |
|
chenxiaojun
|
7e0cd3c297
|
推广平台->数据管理--标题调整
|
5 years ago |
|
chenxiaojun
|
21070ac3a4
|
推广平台->财务管理--标题调整
|
5 years ago |
|
chenxiaojun
|
0f5da378fc
|
推广平台->财务管理--标题调整
|
5 years ago |
|
zhengyongxing
|
0edc4452e3
|
Merge branches 'dev' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
Conflicts:
Application/Mobile/Controller/SsgController.class.php
|
5 years ago |
|
chenzhi
|
2a417c2746
|
123
|
5 years ago |
|
sunke
|
b73472fd9d
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
sunke
|
426d8e4fae
|
bug
|
5 years ago |
|
ELF
|
6403bc9859
|
修改
|
5 years ago |
|
ELF
|
d2cb9b9a2b
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
ELF
|
0b4416f057
|
修改bug
|
5 years ago |
|
chenzhi
|
e61a8af93d
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
chenzhi
|
313cd11796
|
恢复
|
5 years ago |
|
ELF
|
9d5b0e235a
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
ELF
|
639e7117b8
|
修改bug
|
5 years ago |
|
chenzhi
|
4ecbec2f49
|
回掉1.0
|
5 years ago |
|
chenzhi
|
48be6af89b
|
回掉0.4
|
5 years ago |
|
chenzhi
|
f8f5c3b4e0
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
chenzhi
|
222b9d2ec6
|
回0.3
|
5 years ago |
|
ELF
|
2abdcd6147
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
ELF
|
de00fe5e48
|
修改bug
|
5 years ago |
|
chenzhi
|
13700e6123
|
回调0.2
|
5 years ago |
|
chenzhi
|
397eab9c30
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
chenzhi
|
ca5fe30969
|
回调0.1
|
5 years ago |
|
ELF
|
2254610041
|
修改bug
|
5 years ago |
|
chenzhi
|
4c2931c8d3
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
chenzhi
|
e986b5de58
|
123
|
5 years ago |
|
zhengyongxing
|
8e8e59c61c
|
登录sdk，跳转至购买超级签，无需重新登陆
|
5 years ago |
|
zhengyongxing
|
4e06af0acf
|
登录sdk，跳转至购买超级签，无需重新登陆
|
5 years ago |
|
zhengchanglong
|
286febdff6
|
Merge branch 'dev_lww' into dev
|
5 years ago |
zhanglingsheng
|
fb85d32c87
|
合并分支
|
5 years ago |
|
chenzhi
|
0649501b8a
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
chenzhi
|
c211c493ed
|
1
|
5 years ago |
|
sunke
|
275c0a8022
|
下载提交方式修改
|
5 years ago |
|
chenzhi
|
4ebba110d9
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
chenzhi
|
90253ddcf6
|
优化回调
|
5 years ago |
|
sunke
|
0688a046d3
|
修改bug
|
5 years ago |
|
chenzhi
|
995ea3f9a5
|
验证签名
|
5 years ago |
|
zhengchanglong
|
5d9d6542ad
|
Merge branch 'dev_lww' into dev_zcl
|
5 years ago |
|
chenzhi
|
fd53bdda15
|
解决回掉
|
5 years ago |
|
zhanglingsheng
|
a685e7340e
|
礼包列表过滤超级签
|
5 years ago |
|
“用lww
|
8076110f31
|
手机注册-修改账号密码验证规则
|
5 years ago |
|
“用lww
|
ba506916d0
|
复制兑换码提示框修改
|
5 years ago |
|
chenzhi
|
8191f5a50f
|
提示测试
|
5 years ago |
|
yulingwei
|
a11c07c7a6
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
yulingwei
|
38680ddb05
|
更新
|
5 years ago |
|
zhengyongxing
|
1626123074
|
数据统计7日平均时长修正
|
5 years ago |
|
zhengchanglong
|
f8008a4b5e
|
Merge branch 'dev_zyx' into dev_zcl
# Conflicts:
# Data/update.sql
|
5 years ago |
|
zhengyongxing
|
64c059cccc
|
Merge branches 'dev' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
Conflicts:
Data/update.sql
|
5 years ago |
|
chenxiaojun
|
366f5b9add
|
推广平台->游戏管理->专服|混服--样式调整
|
5 years ago |
|
chenxiaojun
|
b4a1a24dda
|
推广平台->游戏管理->专服|混服--样式调整
|
5 years ago |
|
yulingwei
|
24d3e6ab07
|
修改bug
|
5 years ago |
|
yulingwei
|
046beee6be
|
修改bug
|
5 years ago |
|
zhengchanglong
|
a4dc55f4e3
|
Merge branch 'dev_zyx' into dev_zcl
# Conflicts:
# Data/update.sql
|
5 years ago |
|
zhengchanglong
|
65014bb66a
|
Merge branch 'dev_lww' into dev_zcl
|
5 years ago |
|
zhengchanglong
|
974a9d93e4
|
Merge branch 'dev-cz' into dev_zcl
# Conflicts:
# Data/update.sql
|
5 years ago |
|
zhengyongxing
|
f4cb9a98c8
|
数据管理启动机型代码优化
|
5 years ago |
|
zhengyongxing
|
2fb1effdcd
|
后台数据分析应用概况优化
|
5 years ago |
|
“用lww
|
c1b5569213
|
手机官网-手机注册与账号注册修改，昵称自动生成
|
5 years ago |
|
sunke
|
05bb9b4aa3
|
推广业绩导出修复
|
5 years ago |
|
chenxiaojun
|
232a6f7918
|
修改冲突
|
5 years ago |
|
chenxiaojun
|
5d2f499cfd
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
zhengchanglong
|
aa8e612ead
|
超级签测试金额修改
|
5 years ago |
|
ELF
|
3ebaf13810
|
修改bug
|
5 years ago |
|
“用lww
|
ff976bb9eb
|
pc端问题反馈修改
|
5 years ago |
|
“用lww
|
a13e8a5152
|
Merge remote-tracking branch 'origin/dev' into dev_lww
|
5 years ago |
|
ELF
|
270e24346d
|
修改bug
|
5 years ago |
|
ELF
|
e575e3107c
|
调试
|
5 years ago |
|
ELF
|
b69699f5d0
|
代码还原
|
5 years ago |
|
ELF
|
1fd7023c5f
|
代码优化
|
5 years ago |
|
ELF
|
c75d1bf3ad
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
ELF
|
9e1c25a2a3
|
修改bug
|
5 years ago |
|
sunke
|
158d8e8fc2
|
认证图片隐藏
|
5 years ago |
|
chenzhi
|
255d830229
|
优化提示及输入ok
|
5 years ago |
|
chenzhi
|
16d1a28f67
|
优化提示2
|
5 years ago |
|
chenzhi
|
8be0cfb188
|
优化提示
|
5 years ago |
|
chenzhi
|
22b0738203
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
chenzhi
|
7149c94d19
|
测试
|
5 years ago |