tping
|
cf88d4c1db
|
Merge branch 'release' into feature/1211
# Conflicts:
# Application/Home/Controller/BaseController.class.php
|
4 years ago |
|
tping
|
5cf8f2ea10
|
特殊公司
|
4 years ago |
|
tping
|
33ef14e1af
|
特殊外团
|
4 years ago |
 ELF
|
f58e565fe7
|
修改
|
4 years ago |
|
ELF
|
e5a0117912
|
修改
|
4 years ago |
|
tping
|
31ce7b071c
|
1211
|
4 years ago |
|
ELF
|
1b74318619
|
修改
|
4 years ago |
|
廖金灵
|
1b3a365409
|
Merge branch 'hotfix/promote_group_view_recharge' of wmtx/platform into release
雷雨等导量公会组长可以看到充值信息
|
4 years ago |
|
ELF
|
d43d0c2628
|
雷雨等导量公会组长可以看到充值信息
|
4 years ago |
|
ELF
|
1bb1b284e6
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/promote_order_settle_check
|
4 years ago |
万盟天下
|
82cf73ede5
|
Merge branch 'feature/elf_version_1117' of wmtx/platform into release
游戏统计/后台登录时间修改
|
4 years ago |
|
ELF
|
f95125892a
|
优化推广员后台汇总查询
|
4 years ago |
|
ELF
|
7468057834
|
推广员结算订单归属
|
4 years ago |
|
elf@home
|
dd66846e68
|
根据推广公司配置推广后台
|
4 years ago |
|
ELF
|
773068b57c
|
优化代码
|
4 years ago |
|
ELF
|
47ca2f2b9e
|
修改
|
4 years ago |
|
ELF
|
dd71ccdf83
|
修改
|
4 years ago |
|
ELF
|
f490f10ee5
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/testing_resource_admin
|
4 years ago |
张谷诚
|
f23f456ddc
|
Merge branch 'hotfix/orderquery' of wmtx/platform into release
增加清除时间
|
4 years ago |
|
tping
|
5a57d87ff7
|
增加清空时间
|
4 years ago |
|
廖金灵
|
a3ce776d16
|
Merge branch 'feature/version_1028' of wmtx/platform into release
优化代码
|
4 years ago |
|
ELF
|
2dc69ac892
|
修改
|
4 years ago |
|
廖金灵
|
710573f511
|
Merge branch 'feature/version_1028' of wmtx/platform into release
修改数据汇总bug
|
4 years ago |
|
ELF
|
75754a8957
|
修改
|
4 years ago |
|
张谷诚
|
fc666fa7b1
|
Merge branch 'hotfix/orderquery' of wmtx/platform into release
导出支付显示问题
|
4 years ago |
|
tping
|
1c6a17d50f
|
支付方式显示
|
4 years ago |
|
张谷诚
|
f25bc96071
|
Merge branch 'hotfix/orderquery' of wmtx/platform into release
到账时间导出
|
4 years ago |
|
tping
|
adb011ca5a
|
到账时间
|
4 years ago |
|
张谷诚
|
0c9033e700
|
Merge branch 'hotfix/orderquery' of wmtx/platform into release
到账时间导出
|
4 years ago |
|
tping
|
e86f4c4762
|
到账时间
|
4 years ago |
|
张谷诚
|
b642f671c7
|
Merge branch 'hotfix/orderquery' of wmtx/platform into release
|
4 years ago |
|
tping
|
e6ae117fd7
|
1,隐藏删除按钮（后台->推广->游戏分包）
2,推广后台增加下单时间查询
|
4 years ago |
|
廖金灵
|
9c6f1b6789
|
Merge branch 'feature/version_1028' of wmtx/platform into release
修改bug
|
4 years ago |
|
ELF
|
be9075fc63
|
修改bug
|
4 years ago |
|
廖金灵
|
001b390afc
|
Merge branch 'feature/version_1028' of wmtx/platform into release
修改评级等功能
|
4 years ago |
|
ELF
|
34586b228e
|
修改
|
4 years ago |
|
ELF
|
8c8d01a446
|
修改评级
|
4 years ago |
|
ELF
|
092683425d
|
修改
|
4 years ago |
|
ELF
|
3c11826a1c
|
修改
|
4 years ago |
|
elf@home
|
f13f3f7744
|
修改
|
4 years ago |
|
ELF
|
3f92608468
|
推广后台功能开发
|
4 years ago |
|
ELF
|
b44a5118cf
|
修改
|
4 years ago |
|
万盟天下
|
f7bd731ead
|
Merge branch 'feature/testing_resource_admin' of wmtx/platform into master
测试资源功能提交
|
4 years ago |
|
万盟天下
|
b2098410a1
|
Merge branch 'feature/testing_resource_admin' of wmtx/platform into release
测试资源发放
|
4 years ago |
|
ELF
|
18c3e95f30
|
修改
|
4 years ago |
|
ELF
|
c5fe80639f
|
修改
|
4 years ago |
|
ELF
|
06bd640c79
|
修改
|
4 years ago |
|
ELF
|
263e35c097
|
初步提交
|
4 years ago |
|
ELF
|
f0d79c83a2
|
修改
|
4 years ago |
|
ELF
|
dec6c4b222
|
修改权限
|
4 years ago |