郑永星
|
1b86292c4e
|
Merge pull request '2.28号功能提交' (#185) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/185
|
4 years ago |
zhengyongxing
|
73beadd929
|
2.28号功能提交
|
4 years ago |
|
郑永星
|
d73e2bae02
|
Merge pull request '2.28号功能提交' (#184) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/184
|
4 years ago |
|
zhengyongxing
|
bc3f4f02d3
|
2.28号功能提交
|
4 years ago |
|
郑永星
|
727873e25c
|
Merge pull request 'feature/add_item' (#183) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/183
|
4 years ago |
|
zhengyongxing
|
1ec35eeb32
|
2.28号功能提交
|
4 years ago |
chenzhi
|
7756efe859
|
优化结算单显示
|
4 years ago |
|
zhengyongxing
|
0be51f4d62
|
2.28号功能提交
|
4 years ago |
|
郑永星
|
0f39caaf60
|
Merge pull request 'feature/add_item' (#177) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/177
|
4 years ago |
|
zhengyongxing
|
c6587b61a5
|
2.28号功能提交
|
4 years ago |
|
zhengyongxing
|
8e28b1c4ad
|
2.28号功能提交
|
4 years ago |
|
郑永星
|
dfdcedea38
|
Merge pull request '2.28号功能提交' (#176) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/176
|
4 years ago |
|
zhengyongxing
|
016c2e11bd
|
2.28号功能提交
|
4 years ago |
|
chenzhi
|
a889417f5a
|
Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115
|
4 years ago |
|
chenzhi
|
0b4e9fa9a1
|
优化重算
|
4 years ago |
|
郑永星
|
23147ac0cc
|
Merge pull request '2.28号功能提交' (#173) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/173
|
4 years ago |
|
zhengyongxing
|
4425750972
|
2.28号功能提交
|
4 years ago |
|
chenzhi
|
b75bcdbb1c
|
新增上游导出查看
|
4 years ago |
|
郑永星
|
b7a120c56a
|
Merge pull request '2.10号功能提交' (#172) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/172
|
4 years ago |
|
zhengyongxing
|
c2bfcd39b6
|
2.10号功能提交
|
4 years ago |
 廖金灵
|
81ac1baaf1
|
Merge pull request '额外额度计算修改' (#167) from feature/TestingResource-0205 into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/167
|
4 years ago |
liyang
|
e008e14046
|
额外额度计算修改
|
4 years ago |
|
廖金灵
|
e84f8c174a
|
Merge pull request '优化' (#165) from feature/testing_quota_up into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/165
|
4 years ago |
|
ELF
|
8a815af691
|
优化
|
4 years ago |
|
ly
|
4a69622b01
|
额外额度备注信息显示
|
4 years ago |
chenzhi
|
c936ee528c
|
优化取消时间导出错误
|
4 years ago |
|
liyang
|
769a6974ab
|
额外额度、申请批次修改
|
4 years ago |
|
郑永星
|
84d6d1c145
|
Merge pull request '2.7号功能提交' (#161) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/161
|
4 years ago |
|
zhengyongxing
|
6dce14520e
|
2.7号功能提交
|
4 years ago |
|
郑永星
|
4e6e402f71
|
Merge pull request '2.7号功能提交' (#158) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/158
|
4 years ago |
|
zhengyongxing
|
347facea89
|
2.7号功能提交
|
4 years ago |
|
郑永星
|
bf2851b11d
|
Merge pull request '2.7号功能提交' (#157) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/157
|
4 years ago |
|
zhengyongxing
|
fec3c76ac1
|
2.7号功能提交
|
4 years ago |
|
chenzhi
|
3997bc4b17
|
Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115
|
4 years ago |
|
chenzhi
|
2f90e19f1f
|
移除个人导出打款状态
|
4 years ago |
|
chenzhi
|
b592554501
|
Merge branch 'feature/testing_daily_count' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115
|
4 years ago |
|
郑永星
|
12eb8aa9f0
|
Merge pull request '2.7号功能提交' (#153) from feature/add_item into release
2.7号功能提交
|
4 years ago |
|
zhengyongxing
|
53ba2c7698
|
2.7号功能提交
|
4 years ago |
陈志
|
a28c71ecb8
|
Merge pull request 'feature/testing_daily_count' (#152) from feature/testing_daily_count into release
优化测试统计导出
|
4 years ago |
|
chenzhi
|
290b48dc3b
|
优化测试统计导出
|
4 years ago |
|
chenzhi
|
e2882cc5aa
|
新增线上线下结算统计
|
4 years ago |
|
chenzhi
|
9cfe8abe68
|
Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115
|
4 years ago |
|
chenzhi
|
4a80ee2f87
|
优化公会统计说明
|
4 years ago |
|
chenzhi
|
35c25119e4
|
优化管理后台线下打款合计字段
|
4 years ago |
|
ELF
|
a355c2b579
|
优化
|
4 years ago |
|
elf@home
|
23643d2e0b
|
修改
|
4 years ago |
|
郑永星
|
42550a32fb
|
Merge pull request '1.28功能提交' (#131) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/131
|
4 years ago |
|
zhengyongxing
|
199b5e0f51
|
1.28功能提交
|
4 years ago |
|
郑永星
|
e9be27136f
|
Merge pull request '1.28功能提交' (#121) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/121
|
4 years ago |
|
zhengyongxing
|
77f7eda10f
|
1.28功能提交
|
4 years ago |
|
郑永星
|
272eca3f9a
|
Merge pull request '1.28功能提交' (#119) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/119
|
4 years ago |
|
zhengyongxing
|
7a2e4d9033
|
1.28功能提交
|
4 years ago |
|
郑永星
|
5a232e6bb6
|
Merge pull request '1.28功能提交' (#116) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/116
|
4 years ago |
|
zhengyongxing
|
3c566fb2ae
|
1.28功能提交
|
4 years ago |
tping
|
c59b8d1419
|
导出所有
|
4 years ago |
|
tping
|
5c22a252a3
|
Merge branch 'release' into feature/0128
|
4 years ago |
|
tping
|
a5b977aa00
|
导出所有
|
4 years ago |
|
陈志
|
14ba644fda
|
Merge pull request '优化提醒名词' (#111) from feature/testing_daily_count into release
Re优化提醒名词
|
4 years ago |
|
chenzhi
|
9d9ef7a79b
|
优化提醒名词
|
4 years ago |
|
陈志
|
b690ef68a2
|
Merge pull request 'feature/testing_daily_count' (#109) from feature/testing_daily_count into release
优化菜单适配
|
4 years ago |
|
chenzhi
|
b19853edd3
|
优化菜单
|
4 years ago |
|
zhengyongxing
|
8a49578cc4
|
Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/add_item
|
4 years ago |
|
zhengyongxing
|
104051d90f
|
1.28功能提交
|
4 years ago |
|
陈志
|
0b55550a62
|
Merge pull request 'feature/testing_daily_count' (#107) from feature/testing_daily_count into release
优化首页提醒
|
4 years ago |
|
chenzhi
|
13d0c6fa59
|
优化首页提醒
|
4 years ago |
|
chenzhi
|
2658c50c3a
|
新增测试资源统计
|
4 years ago |
|
zhengyongxing
|
f710113820
|
1.28功能提交
|
4 years ago |
|
zhengyongxing
|
ee463829d2
|
1.28功能提交
|
4 years ago |
|
zhengyongxing
|
deff984922
|
1.28功能提交
|
4 years ago |
|
zhengyongxing
|
eb6e027ef7
|
汇总结算单导出功能补充
|
4 years ago |
|
zhengyongxing
|
64a565d908
|
1.28功能提交
|
4 years ago |
|
zhengyongxing
|
0fe7e58c61
|
市场业绩离职功能提交导出修正
|
4 years ago |
|
zhengyongxing
|
d3e9f113ba
|
市场业绩离职功能提交导出修正
|
4 years ago |
|
zhengyongxing
|
6e767a739c
|
市场业绩功能提交
|
4 years ago |
|
zhengyongxing
|
3beeb81063
|
公会信息登记信息补充
|
4 years ago |
|
zhengyongxing
|
e0430cfb46
|
公会信息登记信息补充
|
4 years ago |
|
zhengyongxing
|
f923f4d667
|
公会信息登记信息补充
|
4 years ago |
|
zhengyongxing
|
9fceedd10e
|
模板下载功能添加
|
4 years ago |
|
zhengyongxing
|
07ee17ca1d
|
公会信息录入功能添加
|
4 years ago |
|
zhengyongxing
|
b073f3e8cd
|
特殊补点编辑修改
|
4 years ago |
|
zhengyongxing
|
fecb58efdd
|
特殊补点编辑修改
|
4 years ago |
|
tping
|
8897a87342
|
甲乙方公司
|
4 years ago |
|
廖金灵
|
54266852cc
|
Merge pull request 'feature/more_finance_20201211' (#67) from feature/more_finance_20201211 into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/67
|
4 years ago |
|
chenzhi
|
12f4cda850
|
优化商户筛选
|
4 years ago |
张谷成
|
83148cd777
|
Merge pull request '优化' (#63) from feature/1228zgc into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/63
|
4 years ago |
|
tping
|
9f329b7c34
|
优化
|
4 years ago |
|
张谷成
|
049f08af72
|
Merge pull request '优化' (#59) from feature/1228zgc into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/59
|
4 years ago |
|
tping
|
e3f020965d
|
优化
|
4 years ago |
|
张谷成
|
5de3b95d54
|
Merge pull request '优化' (#58) from feature/1228zgc into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/58
|
4 years ago |
|
tping
|
b4c3b64fb0
|
优化
|
4 years ago |
|
张谷成
|
2123ad9ef4
|
Merge pull request '优化' (#57) from feature/1228zgc into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/57
|
4 years ago |
|
tping
|
e57a5f8e50
|
优化
|
4 years ago |
|
chenzhi
|
7ccf5e5857
|
Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/more_finance_20201211
|
4 years ago |
|
郑永星
|
1496fa349a
|
Merge pull request '12.28功能提交' (#51) from feature/add_item into release
12.28功能提交
|
4 years ago |
|
zhengyongxing
|
0293fd7ff1
|
12.28功能提交
|
4 years ago |
|
郑永星
|
12434fb840
|
Merge pull request 'feature/add_item' (#50) from feature/add_item into release
12.28功能提交
|
4 years ago |
|
chenzhi
|
be8a30a2e8
|
合并
|
4 years ago |
|
zhengyongxing
|
3c166a913e
|
Merge branch 'feature/update_payment' into feature/add_item
# Conflicts:
# Application/Admin/Controller/CompanyStatementOfflineController.class.php
# Application/Admin/Controller/StatementMangementController.class.php
# Application/Payment/Controller/PaymentController.class.php
# Application/Payment/View/Payment/lists.html
# Data/update.sql
|
4 years ago |
|
张谷成
|
1c1ef2e6a9
|
Merge pull request 'feature/1228zgc' (#46) from feature/1228zgc into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/46
|
4 years ago |
|
chenzhi
|
0e54b1c376
|
优化渠道和测试服订单
|
4 years ago |
|
郑永星
|
ad7dc1f46d
|
Merge pull request 'feature/update_payment' (#40) from feature/update_payment into release
12.28功能提交
|
4 years ago |
|
zhengyongxing
|
ffa78964ec
|
12.28功能提交
|
4 years ago |
|
zhengyongxing
|
4f2f18ad91
|
12.28功能提交
|
4 years ago |
|
zhengyongxing
|
c716535975
|
12.28功能提交
|
4 years ago |
|
chenzhi
|
9ab8454970
|
优化结算汇总
|
4 years ago |
|
zhengyongxing
|
8a6191810b
|
12.18功打款能提交
|
4 years ago |
|
tping
|
824b7b3f06
|
公会信息导入导出
|
4 years ago |
|
zhengyongxing
|
7c4e0e7521
|
12.18功能提交
|
4 years ago |
|
zhengyongxing
|
8430fa1813
|
12.18功能提交
|
4 years ago |
|
张谷成
|
e669d1bc38
|
Merge pull request '刷新' (#38) from hotfix/1211bug into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/38
|
4 years ago |
|
tping
|
6e63176176
|
刷新
|
4 years ago |
|
tping
|
24fcfc4b90
|
公会信息
|
4 years ago |
|
张谷成
|
a7553cf116
|
Merge pull request '1' (#36) from hotfix/1211bug into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/36
|
4 years ago |
|
tping
|
1dbc61a602
|
1
|
4 years ago |
|
tping
|
0f7b23ad57
|
1
|
4 years ago |
|
张谷成
|
0c7e4b2d30
|
Merge pull request 'hotfix/1211bug' (#35) from hotfix/1211bug into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/35
|
4 years ago |
|
tping
|
858e929199
|
甲乙方公司
|
4 years ago |
|
tping
|
304c59be10
|
甲乙方公司
|
4 years ago |
|
tping
|
08df25eab3
|
展示错误
|
4 years ago |
|
chenzhi
|
5b5029d570
|
Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/more_finance_20201211
|
4 years ago |
|
chenzhi
|
5f0d0a7101
|
优化游戏统计导出
|
4 years ago |
|
chenzhi
|
c5bc21cb36
|
优化游戏导出
|
4 years ago |
|
张谷成
|
91701cc612
|
Merge pull request '公会信息' (#34) from feature/1228zgc into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/34
|
4 years ago |
|
zhengyongxing
|
87c6c71d0a
|
汇总bug修改
|
4 years ago |
|
zhengyongxing
|
699449a702
|
未结算数据的补充
|
4 years ago |
|
zhengyongxing
|
0c49d1d655
|
Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/add_item_two
|
4 years ago |
|
zhengyongxing
|
c30e396b2c
|
未结算数据的补充
|
4 years ago |
|
zhengyongxing
|
32abdbb390
|
汇总统计修改
|
4 years ago |
|
tping
|
0aef9e3019
|
公会信息
|
4 years ago |
|
chenzhi
|
b7cc3ccd77
|
优化权限
|
4 years ago |
|
chenzhi
|
fe75b57618
|
合并master
|
4 years ago |
|
廖金灵
|
72135079fa
|
Merge pull request '数据授权js错误修正' (#16) from feature/add_item into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/16
|
4 years ago |
|
zhengyongxing
|
a31e3bf1ab
|
数据授权js错误修正
|
4 years ago |
|
廖金灵
|
342b592976
|
Merge pull request 'feature/testing_resource_verify_admin' (#11) from feature/testing_resource_verify_admin into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/11
|
4 years ago |
|
张谷成
|
6e63a3857e
|
Merge pull request 'feature/1211' (#8) from feature/1211 into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/8
|
4 years ago |
|
tping
|
cf88d4c1db
|
Merge branch 'release' into feature/1211
# Conflicts:
# Application/Home/Controller/BaseController.class.php
|
4 years ago |
|
陈志
|
9d30d48fac
|
Merge pull request 'feature/st_mange_20201202' (#6) from feature/st_mange_20201202 into release
优化公式
|
4 years ago |
|
chenzhi
|
0f82acf447
|
优化权限修改
|
4 years ago |
|
chenzhi
|
f034698dbc
|
新增多库
|
4 years ago |
|
zhengyongxing
|
af5aad352a
|
备注bug修改
|
4 years ago |
|
tping
|
481646222f
|
后台 手机号规则 实名认证修改
|
4 years ago |
|
ELF
|
b73b502a67
|
修改
|
4 years ago |
|
zhengyongxing
|
9bec07c7d4
|
不结算bug修改
|
4 years ago |
|
tping
|
e79f18e618
|
1211 审核列表 甲乙方公司
|
4 years ago |
|
chenzhi
|
4f1bebc3af
|
优化游戏统计说明
|
4 years ago |
|
zyx
|
6b0de87280
|
未结算接口修改
|
4 years ago |
|
chenzhi
|
2bc72f9ae2
|
优化个人补点不修改公式
|
4 years ago |
|
chenzhi
|
8d1f77537a
|
优化订单列表新增列
|
4 years ago |
|
chenzhi
|
a741e8d37d
|
订单新增设备类型
|
4 years ago |
|
chenzhi
|
0b979d9b68
|
Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/st_mange_20201202
|
4 years ago |
|
chenzhi
|
8d156ffb64
|
新增结算公式
|
4 years ago |
|
tping
|
31ce7b071c
|
1211
|
4 years ago |
|
ELF
|
88402dfac0
|
修改
|
4 years ago |
|
廖金灵
|
9483e4b7b3
|
Merge branch 'feature/add_item' of wmtx/platform into master
编辑页面调整,及多个编辑错误修正
|
4 years ago |
|
zhengyongxing
|
7c5c67a87c
|
编辑页面调整,及多个编辑错误修正
|
4 years ago |
|
ELF
|
b28e00b9f2
|
Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/promote_order_settle_check
|
4 years ago |
|
chenzhi
|
d06cc0ea10
|
优化去除同公司奖罚
|
4 years ago |
|
廖金灵
|
401ad97cbc
|
Merge branch 'feature/add_item' of wmtx/platform into master
编辑扣款旧的验证添加
|
4 years ago |
|
zhengyongxing
|
bb0d37bb53
|
编辑扣款旧的验证添加
|
4 years ago |
|
zhengyongxing
|
10ddadece7
|
js字符类型修改成数字类型
|
4 years ago |
|
廖金灵
|
470bcdfebf
|
Merge branch 'feature/add_item' of wmtx/platform into master
11月bug修复
|
4 years ago |
|
chenzhi
|
943d63faac
|
优化财务汇总
|
4 years ago |
|
zhengyongxing
|
0572fde5ad
|
11bug修复
|
4 years ago |
|
chenzhi
|
2890f3e820
|
优化订单查看
|
4 years ago |
|
chenzhi
|
147cac3a9e
|
优化公会统计
|
4 years ago |
|
chenzhi
|
b9b497e255
|
优化公会结算
|
4 years ago |
|
chenzhi
|
9803de1edb
|
Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/game_change_statement_20201125
|
4 years ago |
|
chenzhi
|
74d9d6ed18
|
优化充值操作
|
4 years ago |
陈志
|
ff23d13c54
|
Merge branch 'feature/game_select_bug' of wmtx/platform into release
|
4 years ago |
万盟天下
|
8482cd9382
|
Merge branch 'feature/elf_version_1117' of wmtx/platform into release
修改游戏统计bug
|
4 years ago |
|
ELF
|
e46cc5b52e
|
修改bug
|
4 years ago |
|
tping
|
43c62c05d7
|
Merge branch 'release' into feature/zgc_1126
# Conflicts:
# Application/Admin/View/PromoteCompany/add.html
# Application/Admin/View/PromoteCompany/edit.html
|
4 years ago |
|
万盟天下
|
4557b3dc2f
|
Merge branch 'feature/elf_version_1117' of wmtx/platform into release
修改游戏统计bug
|
4 years ago |
|
ELF
|
47fcab323b
|
修改游戏统计bug
|
4 years ago |
|
万盟天下
|
41ab9703a9
|
Merge branch 'feature/add_item' of wmtx/platform into release
11月功能提交
|
4 years ago |
|
万盟天下
|
82cf73ede5
|
Merge branch 'feature/elf_version_1117' of wmtx/platform into release
游戏统计/后台登录时间修改
|
4 years ago |
|
zhengyongxing
|
b32f5efd91
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/add_item_others
Conflicts:
Data/update.sql
|
4 years ago |
|
chenzhi
|
9da9941c9f
|
优化支付数据查看
|
4 years ago |
|
廖金灵
|
5c23366b73
|
Merge branch 'feature/promote_tg_dm' of wmtx/platform into master
根据推广公司配置推广后台
|
4 years ago |
|
zhengyongxing
|
9b87b9c4a1
|
11月功能提交
|
4 years ago |
|
zhengyongxing
|
41e9820d83
|
11月功能提交
|
4 years ago |
|
tping
|
dd786dc27f
|
1126 批量上下架
|
4 years ago |
|
tping
|
b722175785
|
1126 权限
|
4 years ago |
|
tping
|
033cd00aee
|
1126
|
4 years ago |
|
zhengyongxing
|
c749df4936
|
11月功能提交
|
4 years ago |
|
tping
|
d8924dc8be
|
1126 客服qq
|
4 years ago |
|
zhengyongxing
|
5add29fa6b
|
11月功能提交
|
4 years ago |
|
zhengyongxing
|
2040991894
|
11月功能提交
|
4 years ago |
|
ELF
|
ef8334dd18
|
添加域名前缀限制
|
4 years ago |
|
zhengyongxing
|
f3a45dfac6
|
Merge remote-tracking branch 'origin/feature/add_item' into feature/add_item
|
4 years ago |
|
zhengyongxing
|
a6263b2205
|
11月功能提交
|
4 years ago |
|
tping
|
103acdd15d
|
支付通知 小数点后面.00
|
4 years ago |
|
tping
|
0d52dc7d61
|
1126
|
4 years ago |
|
chenzhi
|
56681580dd
|
合并
|
4 years ago |
|
chenzhi
|
6d4fce53eb
|
优化线下打款
|
4 years ago |
|
chenzhi
|
bd125be3dd
|
优化汇总审核流程
|
4 years ago |
|
ELF
|
c339623c78
|
优化
|
4 years ago |
|
elf@home
|
dd66846e68
|
根据推广公司配置推广后台
|
4 years ago |
|
zhengyongxing
|
1626640066
|
11月功能提交
|
4 years ago |
|
zhengyongxing
|
4eff2f0aaa
|
11月功能提交
|
4 years ago |
|
tping
|
025d90f5fa
|
1126
|
4 years ago |
|
chenzhi
|
ad1d4e65a5
|
优化游戏汇总
|
4 years ago |
|
chenzhi
|
bea27fd5de
|
优化游戏汇总
|
4 years ago |
|
tping
|
c75d73c9f7
|
1126
|
4 years ago |
|
ELF
|
6a50654045
|
游戏统计/后台登录时间修改
|
4 years ago |
|
chenzhi
|
7f9bb248dd
|
优化推广员统计
|
4 years ago |
|
chenzhi
|
1f694ef47b
|
优化推广员充值
|
4 years ago |
|
chenzhi
|
a6f9d82245
|
优化推广员累计注册
|
4 years ago |
|
chenzhi
|
7a876e01ab
|
优化新增推广员汇总
|
4 years ago |
|
zhengyongxing
|
f49cd75e86
|
11月功能提交
|
4 years ago |
|
zhengyongxing
|
6811eb806c
|
Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/add_item
Conflicts:
Application/Admin/Controller/CompanyStatementPoolController.class.php
Application/Admin/Controller/CompanyStatementSetController.class.php
Data/update.sql
|
4 years ago |
|
zhengyongxing
|
3656c555d1
|
11月功能提交
|
4 years ago |
|
ELF
|
89332c0d54
|
解决冲突
|
4 years ago |
|
ELF
|
c550846454
|
修改
|
4 years ago |
|
zhengyongxing
|
4526b5b741
|
11月功能提交
|
4 years ago |
|
ELF
|
d0b2e5f459
|
优化
|
4 years ago |
|
ELF
|
07f7bca3ee
|
修改
|
4 years ago |
|
ELF
|
47ca2f2b9e
|
修改
|
4 years ago |
|
chenzhi
|
cdd1cd7d7f
|
优化页面页数
|
4 years ago |
|
ELF
|
dd71ccdf83
|
修改
|
4 years ago |
|
廖金灵
|
648cde1eff
|
Merge branch 'hotfix/perm_market_visiable' of wmtx/platform into release
推广员信息显示通过权限控制
|
4 years ago |
|
ELF
|
53f3ad6864
|
优化
|
4 years ago |
|
廖金灵
|
38dc6c0c56
|
Merge branch 'hotfix/perm_market_visiable' of wmtx/platform into release
市场专员信息显示通过权限控制
|
4 years ago |
|
ELF
|
dfdc31f4dc
|
市场专员信息显示通过权限控制
|
4 years ago |
|
zhengyongxing
|
6021f91604
|
公会订单添加所属商户
|
4 years ago |
|
zhengyongxing
|
3f04fa1507
|
公会统计商户名称修改
|
4 years ago |
|
zhengyongxing
|
58ff5ad1ed
|
公会统计--订单详情 新增所属商户展示
|
4 years ago |
|
zhengyongxing
|
0155111706
|
特殊比例申请比例限制提交
|
4 years ago |
张谷诚
|
b642f671c7
|
Merge branch 'hotfix/orderquery' of wmtx/platform into release
|
4 years ago |
|
tping
|
e6ae117fd7
|
1,隐藏删除按钮（后台->推广->游戏分包）
2,推广后台增加下单时间查询
|
4 years ago |
|
zhengyongxing
|
bb5547fb6f
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/add_item_other
Conflicts:
Data/update.sql
|
4 years ago |
|
zhengyongxing
|
80b148d6c5
|
外团推广功能提交
|
4 years ago |
|
zhengyongxing
|
859f5b58c9
|
汇总功能还原修正
|
4 years ago |
|
zhengyongxing
|
f450df3265
|
汇总功能修正
|
4 years ago |
|
zhengyongxing
|
54a0fde480
|
汇总公司与上游回退
|
4 years ago |
|
zhengyongxing
|
27c95792ff
|
外团推广功能提交
|
4 years ago |
|
zhengyongxing
|
def69bf6aa
|
外团推广功能修正提交
|
4 years ago |
|
zhengyongxing
|
823e241f2e
|
外团推广功能bug修正
|
4 years ago |
|
zhengyongxing
|
5c497b94dc
|
分成比例导出修正
|
4 years ago |
|
zhengyongxing
|
2dbb4a7940
|
市场部提示语修改
|
4 years ago |
|
zhengyongxing
|
c1b556b0b1
|
市场业绩排序修改
|
4 years ago |
|
zhengyongxing
|
6ac5c1d524
|
比例逻辑修改
|
4 years ago |
|
zhengyongxing
|
0c69c8f662
|
汇总结算结算时间位置修改
|
4 years ago |
|
zhengyongxing
|
40664b5f8d
|
市场业绩功能修改，将不结算毛利以日来统计
|
4 years ago |
|
zhengyongxing
|
ba6323203a
|
模板比例bug修改提交
|
4 years ago |
|
zhengyongxing
|
2848f0ce90
|
外团推广游戏功能高亮显示
|
4 years ago |
|
zhengyongxing
|
2914f9964c
|
汇总编辑结算金额总计添加
|
4 years ago |
|
zhengyongxing
|
f0cbe3cafb
|
周结算金额bug修改
|
4 years ago |
|
zhengyongxing
|
86769746ef
|
外团可申请游戏bug修改
|
4 years ago |
|
zhengyongxing
|
e30cd2fea7
|
外团推广功能提交
|
4 years ago |