zhengyongxing
|
878414aeb2
|
测试资源搜索修正
|
5 years ago |
张谷诚
|
c5f9a25a9e
|
Merge branch 'feature/export_authority' of wmtx/platform into release
导出bug修改
|
5 years ago |
|
zyx
|
ee9f53ce0b
|
导出权限bug修改
|
5 years ago |
|
zhengyongxing
|
301a5a7f5a
|
导出bug修改
|
5 years ago |
|
zhengyongxing
|
5e71728097
|
导出bug修改
|
5 years ago |
chenzhi
|
450ef803d6
|
合并
|
5 years ago |
|
chenzhi
|
3e7778df35
|
优化零元问题
|
5 years ago |
|
chenzhi
|
861fd07965
|
优化检索
|
5 years ago |
|
chenzhi
|
834dbe0867
|
优化导出支付信息不记录
|
5 years ago |
 廖金灵
|
52b483356d
|
Merge branch 'feature/export_authority' of wmtx/platform into release
游戏统计bug修改
|
5 years ago |
|
zhengyongxing
|
6081e088db
|
游戏统计bug修改
|
5 years ago |
|
chenzhi
|
0dab114f1e
|
优化操作提醒
|
5 years ago |
|
廖金灵
|
44a49a1b2e
|
Merge branch 'feature/export_authority' of wmtx/platform into release
游戏统计导出修改
|
5 years ago |
|
廖金灵
|
3e43b8cb7c
|
Merge branch 'hotfix/company_bank' of wmtx/platform into release
优化银行信息不记录
|
5 years ago |
|
chenzhi
|
14efc9650f
|
优化银行信息不记录
|
5 years ago |
|
zhengyongxing
|
1659c55ef2
|
用户行为日志修改
|
5 years ago |
|
zhengyongxing
|
0ca2f2a064
|
游戏统计导出修改
|
5 years ago |
|
chenzhi
|
2ad89c2fb6
|
优化导出时间
|
5 years ago |
|
chenzhi
|
5a9fc76374
|
申请编辑信息遮罩不关闭
|
5 years ago |
|
zhengyongxing
|
4d43e877a1
|
Merge branches 'feature/export_authority' and 'release' of 47.111.118.107:wmtx/platform into feature/export_authority
Conflicts:
Data/update.sql
|
5 years ago |
|
zhengyongxing
|
acaebe0217
|
Merge branches 'feature/export_authority' and 'release' of 47.111.118.107:wmtx/platform into feature/export_authority
Conflicts:
Data/update.sql
|
5 years ago |
|
zhengyongxing
|
60c0c8ee39
|
Merge branches 'feature/promote_data_config' and 'release' of 47.111.118.107:wmtx/platform into feature/promote_data_config
Conflicts:
Data/update.sql
|
5 years ago |
|
chenzhi
|
22dc7a62ce
|
优化游戏统计导出游戏类型不识别
|
5 years ago |
|
chenzhi
|
496d6a27bb
|
优化推广员选择后驻留问题
|
5 years ago |
|
chenzhi
|
7fa6baf860
|
玩家登陆显示优化
|
5 years ago |
|
zhengyongxing
|
c58cdd31af
|
用户行为日志导出修正
|
5 years ago |
|
zhengyongxing
|
613d60e4a7
|
数据权限配置修改
|
5 years ago |
|
zhengyongxing
|
057a51dbeb
|
游戏统计bug修正
|
5 years ago |
|
廖金灵
|
e88867abe5
|
Merge branch 'feature/aggregate_finance' of wmtx/platform into release
新增权限不验证
|
5 years ago |
|
zhengyongxing
|
81bd79ecf8
|
游戏统计bug修正
|
5 years ago |
|
chenzhi
|
973f7ca394
|
现在权限不验证
|
5 years ago |
|
廖金灵
|
ff5b2e3483
|
Merge branch 'feature/aggregate_finance' of wmtx/platform into release
聚合财务结算单
|
5 years ago |
|
zhengyongxing
|
4b63c7b786
|
游戏统计bug修正
|
5 years ago |
|
chenzhi
|
21a985ae82
|
聚合财务结算单ok
|
5 years ago |
|
zhengyongxing
|
4f88cd025e
|
绑币导出修正
|
5 years ago |
|
chenzhi
|
8137778ec1
|
新增聚合操作日志
|
5 years ago |
|
zhengyongxing
|
38f478d63d
|
数据调整修改
|
5 years ago |
|
zhengyongxing
|
8d7dbe5469
|
测试资源修改
|
5 years ago |
|
zhengyongxing
|
727b335b45
|
测试资源修改
|
5 years ago |
|
chenzhi
|
63f5354dc3
|
优化重算
|
5 years ago |
|
zhengyongxing
|
5dbd0eb8fa
|
业绩配置修改
|
5 years ago |
|
zhengyongxing
|
a9ce0585cc
|
测试资源配置
|
5 years ago |
|
chenzhi
|
2a28cf9008
|
聚合财务优化权限
|
5 years ago |
|
zhengyongxing
|
b768d41935
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/export_authority
Conflicts:
Application/Home/Controller/PackageController.class.php
|
5 years ago |
|
chenzhi
|
fe662ce160
|
审核子操作ok
|
5 years ago |
|
zhengyongxing
|
b6b97c130d
|
测试资源代码修正
|
5 years ago |
|
chenzhi
|
16d9813e18
|
聚合财务重算
|
5 years ago |
|
zhengyongxing
|
a9e6dafad3
|
行为日志修正
|
5 years ago |
|
zhengyongxing
|
b698495dbb
|
游戏统计添加元素修正
|
5 years ago |
|
chenzhi
|
253b47b2a9
|
聚合财务子操作
|
5 years ago |
|
chenzhi
|
990c62b06a
|
批注增删改查
|
5 years ago |
|
chenzhi
|
6b5f60f8e6
|
新增凭证增删改查
|
5 years ago |
|
chenzhi
|
afd362d847
|
聚合结算单导出优化3
|
5 years ago |
|
chenzhi
|
2fc38b25b6
|
聚合结算单导出优化2
|
5 years ago |
|
chenzhi
|
ce4c938080
|
优化聚合结算导出
|
5 years ago |
|
chenzhi
|
cf9480eb89
|
聚合财务导出
|
5 years ago |
|
chenzhi
|
422728ed11
|
聚合财务编辑
|
5 years ago |
|
zhengyongxing
|
0ebde4cb17
|
导出权限修正
|
5 years ago |
|
chenzhi
|
bf7c7ed14f
|
审核
|
5 years ago |
|
ELF
|
4a92ab8543
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/web_register
|
5 years ago |
|
zhengyongxing
|
13232b3b04
|
获取用户账号接口
|
5 years ago |
|
zhengyongxing
|
e60b9b2edf
|
测试资源批量封号
|
5 years ago |
|
chenzhi
|
114cf4a503
|
聚合对账新增对账金额统计
|
5 years ago |
|
chenzhi
|
51322e3317
|
聚合财务2
|
5 years ago |
|
chenzhi
|
6d0e7c3a00
|
聚合对账1
|
5 years ago |
|
ELF
|
d9cc82f73a
|
修改网站注册
|
5 years ago |
|
chenzhi
|
73ac725950
|
聚合脚本ok
|
5 years ago |
|
zhengyongxing
|
63e4789069
|
游戏编辑支付宝 汇付宝添加
|
5 years ago |
|
chenzhi
|
95cd9993e2
|
聚合财务1
|
5 years ago |
|
zhengyongxing
|
941f27e2e3
|
获取用户账号的方法添加
|
5 years ago |
|
zhengyongxing
|
4d938b85f4
|
导出账号权限修改配置
|
5 years ago |
|
zhengyongxing
|
0482836a8e
|
导出账号权限添加
|
5 years ago |
|
zhengyongxing
|
a5554f7fa3
|
推广员业务配置功能添加
|
5 years ago |
|
zhengyongxing
|
295ca2d803
|
推广员业务配置功能添加
|
5 years ago |
万盟天下
|
aa663b3c02
|
Merge branch 'release' of wmtx/platform into master
优化游戏管理
|
5 years ago |
|
ELF
|
144e4e4ea7
|
计算ARPU
|
5 years ago |
|
万盟天下
|
c292e9ed6c
|
Merge branch 'feature/promote_all_check' of wmtx/platform into release
推广员游戏列表查看全选问题修正
|
5 years ago |
|
ELF
|
908722c5be
|
修改
|
5 years ago |
|
zhengyongxing
|
1a0b2dbaba
|
推广员游戏列表查看全选问题
|
5 years ago |
|
zhengyongxing
|
fcc7bf2aaa
|
管理后台-财务管理-游戏统计-添加元素
|
5 years ago |
|
zhengyongxing
|
322b4b6cee
|
管理后台导出权限添加
|
5 years ago |
|
zhengyongxing
|
001e9e70f8
|
管理后台导出权限添加
|
5 years ago |
|
廖金灵
|
a6dffecaf9
|
Merge branch 'feature/fix_work_order' of wmtx/platform into release
修复统计问题
|
5 years ago |
yulingwei
|
8fc1199e79
|
upt
|
5 years ago |
|
yulingwei
|
70f3da8017
|
upt
|
5 years ago |
|
廖金灵
|
7ab6c8ad68
|
Merge branch 'feature/fix_work_order' of wmtx/platform into release
修复问题
|
5 years ago |
|
yulingwei
|
2ac6f7ebee
|
upt
|
5 years ago |
|
yulingwei
|
c3cb357e1c
|
upt
|
5 years ago |
|
廖金灵
|
b09ccfc42d
|
Merge branch 'feature/fix_work_order' of wmtx/platform into release
修复问题
|
5 years ago |
|
yulingwei
|
872a76356d
|
upt
|
5 years ago |
|
廖金灵
|
820885f3dd
|
Merge branch 'feature/platform_rule' of wmtx/platform into release
推广规则
|
5 years ago |
sunke
|
bde08adcc2
|
平台币
|
5 years ago |
|
廖金灵
|
8b2ae9d6da
|
Merge branch 'feature/fix_work_order' of wmtx/platform into release
工单统计及iOS下载数优化
|
5 years ago |
|
廖金灵
|
72d1d2f338
|
Merge branch 'feature/president_modify' of wmtx/platform into release
修改会长押金编辑付款人付款账号非必填
|
5 years ago |
|
sunke
|
163388e75c
|
平台币
|
5 years ago |
|
sunke
|
ae0e10166a
|
pt
|
5 years ago |
|
sunke
|
07c385e561
|
平台
|
5 years ago |
|
sunke
|
0758921bfe
|
平台
|
5 years ago |
|
sunke
|
aa14aa95a6
|
平台
|
5 years ago |
|
sunke
|
848eb6c294
|
平台
|
5 years ago |
|
sunke
|
b6649a7b9d
|
平台币
|
5 years ago |
|
yulingwei
|
ccc159d3b2
|
upt
|
5 years ago |
|
yulingwei
|
42026e753a
|
upt
|
5 years ago |
|
yulingwei
|
7b3006f871
|
upt
|
5 years ago |
|
yulingwei
|
5009a327db
|
upt
|
5 years ago |
|
yulingwei
|
ac83e556ff
|
upt
|
5 years ago |
|
yulingwei
|
f1428a8fe7
|
upt
|
5 years ago |
|
sunke
|
031528411b
|
平台币
|
5 years ago |
|
sunke
|
5fa22cfa40
|
弹窗
|
5 years ago |
|
sunke
|
fee97bb00a
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/platform_rule
|
5 years ago |
|
yulingwei
|
dec978da7a
|
upt
|
5 years ago |
|
yulingwei
|
e462305587
|
upt
|
5 years ago |
|
yulingwei
|
312448c724
|
upt
|
5 years ago |
|
sunke
|
c1168740b6
|
平台币
|
5 years ago |
|
sunke
|
253c956794
|
平台币
|
5 years ago |
|
sunke
|
2adcb68c06
|
平台币新增需求
|
5 years ago |
|
sunke
|
97e8397d76
|
文件夹优化
|
5 years ago |
|
sunke
|
1fe794b597
|
平台规则样式优化
|
5 years ago |
|
sunke
|
ec309c2b6a
|
规则
|
5 years ago |
|
sunke
|
bdb688c985
|
编辑规则
|
5 years ago |
|
zhengyongxing
|
2a54b0ed08
|
汇付宝添加支付宝与微信
|
5 years ago |
|
ELF
|
94575cae29
|
修改会长押金编辑付款人付款账号非必填
|
5 years ago |
|
yulingwei
|
c1d03cc526
|
upt
|
5 years ago |
|
yulingwei
|
9d6bf8225a
|
upt
|
5 years ago |
|
zhengyongxing
|
541ec17db5
|
隐藏威富通添加汇付宝
|
5 years ago |
|
yulingwei
|
007374e121
|
upt
|
5 years ago |
|
廖金灵
|
bf701babb7
|
Merge branch 'feature/giftbag_tf' of wmtx/platform into release
隐藏礼包数量
|
5 years ago |
|
ELF
|
41e1801550
|
修改手机登录bug
|
5 years ago |
|
廖金灵
|
8dc7adb539
|
Merge branch 'feature/giftbag_tf' of wmtx/platform into release
添加tf礼包
|
5 years ago |
|
sunke
|
ce2408576c
|
充值方式统计匹配支付渠道
|
5 years ago |
|
sunke
|
6cc33a7fe8
|
导出顺序
|
5 years ago |
|
sunke
|
15f6cb19a3
|
渠道支付顺序
|
5 years ago |
|
ELF
|
2a2e5f0d31
|
添加tf礼包问题
|
5 years ago |
|
sunke
|
b4e66dcd40
|
隐藏推广配置
|
5 years ago |
|
张谷诚
|
c5af3c29d7
|
Merge branch 'hotfix/finance_game_name_change_2' of wmtx/platform into release
支付渠道测试订单录入bug修正，支付意愿统计功能优化
|
5 years ago |
|
廖金灵
|
9f202c3991
|
Merge branch 'feature/finance_compare' of wmtx/platform into release
财务导入对比
|
5 years ago |
|
chenzhi
|
9237bc3cc8
|
优化选择
|
5 years ago |
|
chenzhi
|
abf43566e4
|
调整参数
|
5 years ago |
|
廖金灵
|
86a90467ff
|
Merge branch 'feature/president_apply' of wmtx/platform into release
修改会长押金需求
|
5 years ago |
|
zhengyongxing
|
d4aafd2983
|
支付渠道测试订单录入bug修正，支付意愿统计功能优化
|
5 years ago |
|
yulingwei
|
6f7d285f9f
|
修复资源工单完成情况
|
5 years ago |
|
chenzhi
|
14ffc00f86
|
优化权限处理
|
5 years ago |
|
chenzhi
|
c0df7f23c3
|
优化高亮
|
5 years ago |
|
zhengyongxing
|
dc5437d7cb
|
支付渠道测试订单录入bug修正，支付意愿统计功能优化
|
5 years ago |
chenzhi
|
d4a498baba
|
优化用户登录时间为0时为暂无登录
|
5 years ago |
|
chenzhi
|
b1701889c4
|
优化财务比较金额不符规则
|
5 years ago |
|
chenzhi
|
5ddf75a600
|
财务对比ok
|
5 years ago |
|
chenzhi
|
b2ad4e8b6e
|
财务对比 v1
|
5 years ago |
|
chenzhi
|
a2db46d1c0
|
财务对比首页
|
5 years ago |
|
zhengyongxing
|
f37cdc596d
|
支付渠道测试订单录入bug修正，支付意愿统计功能优化
|
5 years ago |
|
chenzhi
|
79f4719dec
|
财务对比7
|
5 years ago |
|
chenzhi
|
c4eb963cfe
|
财务比对5
|
5 years ago |
|
zhengyongxing
|
de646044c2
|
支付渠道详情检索修正
|
5 years ago |
|
zhengyongxing
|
573e580778
|
支付渠道详情检索修正
|
5 years ago |
|
zhengyongxing
|
bba97196ec
|
支付渠道详情检索修正
|
5 years ago |
|
zhengyongxing
|
2fab9d3ef9
|
支付渠道详情统计bug修改
|
5 years ago |
|
zhengyongxing
|
45847a8194
|
支付渠道详情统计bug修改
|
5 years ago |
|
zhengyongxing
|
e51cad19eb
|
Merge remote-tracking branch 'origin/hotfix/finance_game_name_change_2' into hotfix/finance_game_name_change_2
|
5 years ago |
|
zhengyongxing
|
e7e7df569b
|
支付渠道统计bug修改
|
5 years ago |
|
chenzhi
|
6abef9385e
|
优化测试服订单导出
|
5 years ago |
|
chenzhi
|
202f9a45d1
|
财务对比4
|
5 years ago |
|
zhengyongxing
|
e34c553358
|
支付渠道统计bug修改
|
5 years ago |
|
zhengyongxing
|
8d742886a7
|
支付渠道统计bug修改
|
5 years ago |
|
chenzhi
|
effe6c572e
|
财务比较3
|
5 years ago |
|
zhengyongxing
|
96eee4f9f5
|
支付渠道统计bug修改
|
5 years ago |
|
zhengyongxing
|
ab01c02606
|
支付渠道意愿统计修改
|
5 years ago |
|
chenzhi
|
f3a662324d
|
修正测试服订单检索错误问题
|
5 years ago |
|
chenzhi
|
33be2ba05b
|
优化游戏统计平台币直充搜索后数据不符合问题
|
5 years ago |
|
chenzhi
|
def286ec80
|
财务比较2
|
5 years ago |
|
廖金灵
|
bab7fec46d
|
Merge branch 'fix/fiancecount_gamename_change' of wmtx/platform into release
游戏名称不含设备类型优化
|
5 years ago |
|
chenzhi
|
eaa51463e5
|
公会统计
|
5 years ago |
|
chenzhi
|
ea69ecb086
|
财务比较2
|
5 years ago |
|
zhengyongxing
|
a7838bb552
|
Merge remote-tracking branch 'origin/fix/fiancecount_gamename_change' into fix/fiancecount_gamename_change
|
5 years ago |
|
zhengyongxing
|
e445108eb6
|
支付渠道统计修改
|
5 years ago |
|
张谷诚
|
13c352a924
|
Merge branch 'feature/pay_white_list' of wmtx/platform into release
支付渠道意愿a标签悬停变成手势
|
5 years ago |
|
chenzhi
|
c45ca2942d
|
优化设备名称函数
|
5 years ago |
|
chenzhi
|
6f7e0de83d
|
优化平台币设备，名称
|
5 years ago |
|
chenzhi
|
6c8f935170
|
支付渠道
|
5 years ago |
|
chenzhi
|
751357feef
|
优化导出
|
5 years ago |
|
chenzhi
|
e0c946e67c
|
工会统计2
|
5 years ago |
|
chenzhi
|
b36515a720
|
工会统计
|
5 years ago |
|
chenzhi
|
48e5e4d824
|
财务对比1
|
5 years ago |
|
chenzhi
|
ce1d15c602
|
优化游戏订单导出
|
5 years ago |
|
zhengyongxing
|
4361b3c3ba
|
支付渠道意愿a标签悬停变成手势
|
5 years ago |
|
廖金灵
|
d781d6825c
|
Merge branch 'feature/pay_white_list' of wmtx/platform into release
支付渠道意愿统计文字修改，及排序方式修正
|
5 years ago |
|
zhengyongxing
|
674e727921
|
支付渠道意愿统计文字修改
|
5 years ago |
|
张谷诚
|
170b116333
|
Merge branch 'feature/pay_white_list' of wmtx/platform into release
支付渠道意愿统计bug上传
|
5 years ago |
|
zhengyongxing
|
9eff370801
|
支付渠道意愿统计bug上传
|
5 years ago |
|
张谷诚
|
e42281bdfe
|
Merge branch 'feature/pay_white_list' of wmtx/platform into release
支付渠道意愿统计bug上传
|
5 years ago |
|
zhengyongxing
|
f40bd57698
|
支付渠道意愿统计bug上传
|
5 years ago |
|
廖金灵
|
985fdab851
|
Merge branch 'feature/limit_pay' of wmtx/platform into release
支付限额
|
5 years ago |
|
张谷诚
|
b9f466f73c
|
Merge branch 'feature/pay_white_list' of wmtx/platform into release
支付意向
支付限额白名单
|
5 years ago |
|
zhengyongxing
|
f7c9730153
|
市场结算管理优化
|
5 years ago |
|
sunke
|
d31f5c8691
|
位数
|
5 years ago |
|
sunke
|
55316d475f
|
限额
|
5 years ago |
|
sunke
|
163ad97d60
|
支付限额
|
5 years ago |
|
sunke
|
817b39c391
|
支付限额
|
5 years ago |
|
sunke
|
56b5144440
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/limit_pay
|
5 years ago |
|
廖金灵
|
9222d99127
|
Merge branch 'feature/change_company_belong' of wmtx/platform into release
推广员内外团归属优化
|
5 years ago |
|
sunke
|
19af71ce72
|
支付限额
|
5 years ago |