chenzhi
|
6f90b18be9
|
优化上游pool
|
4 years ago |
郑永星
|
2496f1f64b
|
Merge branch 'feature/add_item_other' of wmtx/platform into release
内团推广游戏提示语修改
|
4 years ago |
zhengyongxing
|
178f89f43b
|
内团推广游戏提示语修改
|
4 years ago |
|
郑永星
|
a9f96722b1
|
Merge branch 'feature/add_item_other' of wmtx/platform into release
外团推广功能提交
|
4 years ago |
|
zhengyongxing
|
25e710c27e
|
外团推广功能提交
|
4 years ago |
张谷诚
|
b642f671c7
|
Merge branch 'hotfix/orderquery' of wmtx/platform into release
|
4 years ago |
tping
|
e6ae117fd7
|
1,隐藏删除按钮（后台->推广->游戏分包）
2,推广后台增加下单时间查询
|
4 years ago |
|
zhengyongxing
|
0f44573fe2
|
市场业绩提交
|
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
|
ce3aa147e5
|
Merge remote-tracking branch 'origin/feature/add_item' into feature/add_item
|
4 years ago |
|
zhengyongxing
|
ccf27d77a1
|
市场业绩删除修正
|
4 years ago |
|
chenzhi
|
9083471980
|
优化补点
|
4 years ago |
|
zhengyongxing
|
295f86e588
|
Merge remote-tracking branch 'origin/feature/add_item' into feature/add_item
|
4 years ago |
|
zhengyongxing
|
7463222308
|
外团推广功能提交
|
4 years ago |
|
chenzhi
|
3f6472e64c
|
优化下游个人补点
|
4 years ago |
|
zhengyongxing
|
e33b19d4b0
|
外团推广功能提交
|
4 years ago |
|
zhengyongxing
|
4e8cb8dfe1
|
外团推广功能提交
|
4 years ago |
|
zhengyongxing
|
f569747948
|
外团推广功能提交
|
4 years ago |
|
zhengyongxing
|
f38b9026b5
|
外团推广功能提交
|
4 years ago |
|
zhengyongxing
|
f6f9437ed0
|
外团推广功能提交
|
4 years ago |
|
zhengyongxing
|
b0b893e51d
|
Merge remote-tracking branch 'origin/feature/add_item' into feature/add_item
|
4 years ago |
|
zhengyongxing
|
80b148d6c5
|
外团推广功能提交
|
4 years ago |
|
chenzhi
|
6ce7377dc1
|
优化补点
|
4 years ago |
|
zhengyongxing
|
859f5b58c9
|
汇总功能还原修正
|
4 years ago |
|
zhengyongxing
|
f450df3265
|
汇总功能修正
|
4 years ago |
|
zhengyongxing
|
54a0fde480
|
汇总公司与上游回退
|
4 years ago |
|
zhengyongxing
|
233fa89251
|
外团推广功能提交
|
4 years ago |
|
zhengyongxing
|
38fb5398d1
|
外团推广功能提交
|
4 years ago |
|
zhengyongxing
|
27c95792ff
|
外团推广功能提交
|
4 years ago |
|
zhengyongxing
|
def69bf6aa
|
外团推广功能修正提交
|
4 years ago |
|
zhengyongxing
|
0af52ad4ea
|
汇总金额为空时添加数据
|
4 years ago |
|
zhengyongxing
|
befa97e04d
|
Merge branch 'feature/add_item' of 47.111.118.107:wmtx/platform into feature/add_item
|
4 years ago |
|
chenzhi
|
96b296a4b6
|
优化比例为空
|
4 years ago |
|
zhengyongxing
|
8340ddc115
|
外团推广功能提交
|
4 years ago |
|
zhengyongxing
|
c27315d3c0
|
外团推广功能提交
|
4 years ago |
|
chenzhi
|
ded1da96f9
|
Merge branch 'feature/add_item' of 47.111.118.107:wmtx/platform into feature/add_item
|
4 years ago |
|
chenzhi
|
7ade60fb02
|
优化比例获取
|
4 years ago |
|
zhengyongxing
|
a5c7c224aa
|
比例功能提交
|
4 years ago |
|
zhengyongxing
|
823e241f2e
|
外团推广功能bug修正
|
4 years ago |
|
zhengyongxing
|
97c33c8e1b
|
游戏比例公用方法修正
|
4 years ago |
|
zhengyongxing
|
34b12ad382
|
定时器功能提交
|
4 years ago |
|
zhengyongxing
|
5c497b94dc
|
分成比例导出修正
|
4 years ago |
|
zhengyongxing
|
2dbb4a7940
|
市场部提示语修改
|
4 years ago |
|
zhengyongxing
|
c1b556b0b1
|
市场业绩排序修改
|
4 years ago |
|
chenzhi
|
10d13472ec
|
紧急修复外团选择游戏
|
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
|
aa852a9a7f
|
外团推广功能金额修改
|
4 years ago |
|
zhengyongxing
|
f0cbe3cafb
|
周结算金额bug修改
|
4 years ago |
|
zhengyongxing
|
86769746ef
|
外团可申请游戏bug修改
|
4 years ago |
|
zhengyongxing
|
e30cd2fea7
|
外团推广功能提交
|
4 years ago |
|
zhengyongxing
|
5c57abc794
|
历史流水比例修正
|
4 years ago |
|
zhengyongxing
|
f8a7d53ac8
|
外团推广功能提交
|
4 years ago |
|
zhengyongxing
|
a00834e4e5
|
外团推广功能不结算提交
|
4 years ago |
|
zhengyongxing
|
9c49d8bedc
|
外团推广功能提交
|
4 years ago |
|
zhengyongxing
|
3855d8d3a9
|
市场业绩的功能提交
|
4 years ago |
 ELF
|
47ff398bf4
|
修改
|
4 years ago |
|
ELF
|
ffad0d78c5
|
修改
|
4 years ago |
|
ELF
|
62d2eaef72
|
去除商户规则配置删除功能
|
4 years ago |
|
ELF
|
3a4fb51222
|
修改支付商户规则bug
|
4 years ago |
|
ELF
|
e25f30d13c
|
修改
|
4 years ago |
|
ELF
|
dc5e032817
|
修改
|
4 years ago |
|
ELF
|
fe55de4aaf
|
修改
|
4 years ago |
|
zhengyongxing
|
32b139a976
|
比例时间排序
|
4 years ago |
|
zhengyongxing
|
9bf3c89659
|
特殊比例与模板比例添加流水类型
|
4 years ago |
|
ELF
|
b44a5118cf
|
修改
|
4 years ago |
万盟天下
|
f7bd731ead
|
Merge branch 'feature/testing_resource_admin' of wmtx/platform into master
测试资源功能提交
|
4 years ago |
|
ELF
|
36c240c608
|
修改
|
4 years ago |
|
zhengyongxing
|
68ba764d72
|
Merge branch 'hotfix/modify_special_piont' into feature/add_item
|
4 years ago |
|
zhengyongxing
|
d9b37792fd
|
特殊补点bug修正
|
4 years ago |
|
zhengyongxing
|
6b47baf59a
|
汇总编辑前端修改
|
4 years ago |
|
ELF
|
ae3e49b95f
|
修改
|
4 years ago |
|
ELF
|
f77505925f
|
修改
|
4 years ago |
|
ELF
|
f3771dfd2d
|
修改
|
4 years ago |
|
ELF
|
a10bb888da
|
修改bug
|
4 years ago |
|
zhengyongxing
|
4f35cacbab
|
汇总模板修改提交
|
4 years ago |
|
ELF
|
36c4c666ec
|
修改bug
|
4 years ago |
|
ELF
|
18c3e95f30
|
修改
|
4 years ago |
|
ELF
|
8e4ba0e20e
|
修改
|
4 years ago |
|
ELF
|
c5fe80639f
|
修改
|
4 years ago |
|
ELF
|
06bd640c79
|
修改
|
4 years ago |
|
ELF
|
263e35c097
|
初步提交
|
4 years ago |
|
廖金灵
|
662efdb613
|
Merge branch 'feature/add_item' of wmtx/platform into master
聚合结算单导出bug修正
|
4 years ago |
|
zhengyongxing
|
3f90e1d9ee
|
汇总审批重算状态修正
|
4 years ago |
|
zhengyongxing
|
723b3c9fa2
|
汇总重算提示语修正
|
4 years ago |
|
zhengyongxing
|
e7b64f27f2
|
汇总重算提示语修正
|
4 years ago |
|
郑永星
|
8d37653db4
|
Merge branch 'feature/add_item' of wmtx/platform into release
聚合结算单导出公式添加
|
4 years ago |
|
zhengyongxing
|
ff46e189cc
|
聚合结算单导出公式添加
|
4 years ago |
|
郑永星
|
a8c008923e
|
Merge branch 'feature/add_item' of wmtx/platform into release
汇总导出bug修正
|
4 years ago |
|
zhengyongxing
|
053e8acb8f
|
汇总导出bug修正
|
4 years ago |
|
郑永星
|
6cbc8e0102
|
Merge branch 'feature/add_item' of wmtx/platform into release
聚合汇总导出bug修改
|
4 years ago |
|
zhengyongxing
|
1f31244d10
|
聚合汇总导出bug修改
|
4 years ago |
|
郑永星
|
37dd11369e
|
Merge branch 'feature/add_item' of wmtx/platform into release
聚合结算单导出bug修正
|
4 years ago |
|
zhengyongxing
|
ac5c1a199c
|
聚合结算单导出bug修正
|
4 years ago |
|
廖金灵
|
e916641647
|
Merge branch 'feature/add_item' of wmtx/platform into master
聚合结算单导出个人与公司导出不相同
|
4 years ago |
|
郑永星
|
ac14a6be90
|
Merge branch 'feature/add_item' of wmtx/platform into release
聚合结算单导出个人与公司导出不相同
|
4 years ago |
|
zyx
|
3db4fe1f60
|
聚合结算单导出个人与公司导出不相同
|
4 years ago |
|
zyx
|
b92ce713b3
|
聚合结算单上线
|
4 years ago |
|
廖金灵
|
ef9a6d446b
|
Merge branch 'feature/promote_level_sys' of wmtx/platform into master
游戏统计bug
|
4 years ago |
|
ELF
|
2b1980bfbd
|
修改
|
4 years ago |
|
廖金灵
|
51e3863b82
|
Merge branch 'feature/add_item' of wmtx/platform into master
导出公式添加
|
4 years ago |
|
zhengyongxing
|
f72bb66356
|
导出公式添加
|
4 years ago |
|
廖金灵
|
a2a9625933
|
Merge branch 'feature/add_item' of wmtx/platform into master
聚合公司汇总公司添加，公司绑定编辑开放
|
4 years ago |
|
郑永星
|
cdcfc02614
|
Merge branch 'feature/add_item' of wmtx/platform into release
公司绑定参数错误修正
|
4 years ago |
|
zhengyongxing
|
0d13b05dc0
|
公司绑定参数错误修正
|
4 years ago |
|
郑永星
|
38eb0f4957
|
Merge branch 'feature/add_item' of wmtx/platform into release
汇总bug修正
|
4 years ago |
|
zhengyongxing
|
71826be2cc
|
汇总bug修正
|
4 years ago |
|
郑永星
|
0fd8c71af0
|
Merge branch 'feature/add_item' of wmtx/platform into release
汇总bug修正
|
4 years ago |
|
zhengyongxing
|
ba74305974
|
汇总bug修正
|
4 years ago |
|
郑永星
|
ed4297cb71
|
Merge branch 'feature/add_item' of wmtx/platform into release
汇总bug修正
|
4 years ago |
|
zhengyongxing
|
c711ef4b92
|
汇总bug修正
|
4 years ago |
|
郑永星
|
d7edb41f44
|
Merge branch 'feature/add_item' of wmtx/platform into release
汇总bug修正
|
4 years ago |
|
zhengyongxing
|
01df95637a
|
汇总bug修正
|
4 years ago |
|
郑永星
|
61d69eab60
|
Merge branch 'feature/add_item' of wmtx/platform into release
|
4 years ago |
|
zhengyongxing
|
f1308fce73
|
汇总bug修正
|
4 years ago |
|
郑永星
|
b69bc8ef6a
|
Merge branch 'feature/add_item' of wmtx/platform into release
汇总bug修正
|
4 years ago |
|
zhengyongxing
|
3f78880f7d
|
汇总bug修正
|
4 years ago |
|
ELF
|
2ff1fc0041
|
修改
|
4 years ago |
|
ELF
|
55466e44ee
|
修改
|
4 years ago |
|
ELF
|
dec6c4b222
|
修改权限
|
4 years ago |
|
chenzhi
|
f311da5208
|
优化银行卡号不限制
|
4 years ago |
|
zyx
|
a2d68a2752
|
汇总状态的操作修改
|
4 years ago |
|
zyx
|
5bec0ba91c
|
汇总状态的操作修改
|
4 years ago |
|
zyx
|
c99cad808c
|
汇总状态的操作修改
|
4 years ago |
|
zyx
|
4a7915ef69
|
汇总状态的操作修改
|
4 years ago |
|
zyx
|
d42cd15b0b
|
汇总状态的操作修改
|
4 years ago |
|
zyx
|
041006e1b4
|
汇总状态的操作修改
|
4 years ago |
|
zyx
|
2c5889cd50
|
汇总状态的操作修改
|
4 years ago |
|
zyx
|
c692e51fa7
|
汇总状态的操作修改
|
4 years ago |
|
zyx
|
52f4cbacb9
|
汇总状态的操作修改
|
4 years ago |
|
zyx
|
178c86a751
|
撤销汇总添加退回审核状态
|
4 years ago |
|
zhengyongxing
|
56593d5ee8
|
汇总bug修正
|
4 years ago |
|
zhengyongxing
|
dc5a65903b
|
汇总bug修正
|
4 years ago |
|
zhengyongxing
|
ef0c4427ce
|
Merge branches 'feature/add_item' and 'master' of 47.111.118.107:wmtx/platform into feature/add_item
Conflicts:
Data/update.sql
|
4 years ago |
|
zhengyongxing
|
4210bb7bf0
|
汇总bug修正
|
4 years ago |
|
zhengyongxing
|
b4bdcd24fc
|
汇总bug流程修正
|
4 years ago |
|
zhengyongxing
|
e153fb66ca
|
聚合重新汇总bug修正
|
4 years ago |
|
万盟天下
|
9db2434d10
|
Merge branch 'feature/add_item' of wmtx/platform into master
聚合公司绑定流程优化
|
4 years ago |
|
zhengyongxing
|
2b4ed15a30
|
聚合公司绑定流程优化
|
4 years ago |
|
郑永星
|
8b9c732f6a
|
Merge branch 'feature/add_item' of wmtx/platform into master
审核拒绝bug修正
|
4 years ago |
|
zhengyongxing
|
7d3c8ebd61
|
审核拒绝bug修正
|
4 years ago |
|
万盟天下
|
1cb13ebb4c
|
Merge branch 'feature/add_item' of wmtx/platform into master
聚合汇总bug修正
|
4 years ago |
|
zhengyongxing
|
a2b085562d
|
聚合汇总bug修正
|
4 years ago |
|
郑永星
|
4f9c672aa1
|
Merge branch 'feature/add_item' of wmtx/platform into release
聚合公司绑定修正
|
4 years ago |
|
zhengyongxing
|
a977cf5f31
|
聚合公司绑定修正
|
4 years ago |
|
郑永星
|
bdcc9a8e27
|
Merge branch 'hotfix/game_ratio_modify' of wmtx/platform into release
特殊比例bug修正
|
4 years ago |
|
zhengyongxing
|
0dd7bceb3f
|
特殊比例bug修正
|
4 years ago |
|
ELF
|
19c782b053
|
解决冲突
|
4 years ago |
|
郑永星
|
2c8c246d31
|
Merge branch 'feature/add_item' of wmtx/platform into release
汇总权限测试
|
4 years ago |
|
zhengyongxing
|
6b486331b5
|
汇总权限测试
|
4 years ago |
|
郑永星
|
66af352eb8
|
Merge branch 'feature/add_item' of wmtx/platform into release
公司绑定修正
|
4 years ago |
|
zhengyongxing
|
f4f822d31a
|
公司绑定修正
|
4 years ago |
|
郑永星
|
07e877af4b
|
Merge branch 'feature/add_item' of wmtx/platform into release
绑定公司修正
|
4 years ago |
|
zhengyongxing
|
f757c10c61
|
绑定公司修正
|
4 years ago |
|
郑永星
|
a825f4757a
|
Merge branch 'feature/add_item' of wmtx/platform into release
小bug修改
|
4 years ago |
|
zhengyongxing
|
0ebaf6ed64
|
小bug修改
|
4 years ago |
|
郑永星
|
af65b143bb
|
Merge branch 'feature/add_item' of wmtx/platform into release
押金bug修正
|
4 years ago |
|
zhengyongxing
|
c06e53ab31
|
汇总bug修正
|
4 years ago |
|
郑永星
|
e593db626c
|
Merge branch 'feature/add_item' of wmtx/platform into release
押金bug修正
|
4 years ago |
|
zhengyongxing
|
1e67b1d1a1
|
汇总bug修正
|
4 years ago |
|
chenzhi
|
12e8500ce3
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/new_statement_0925
|
4 years ago |
|
zhengyongxing
|
a1ac92dc02
|
押金bug修正
|
4 years ago |
|
ELF
|
268ea4e34d
|
修改
|
4 years ago |
|
zhengyongxing
|
ce0196afea
|
押金bug修正
|
4 years ago |
|
zhengyongxing
|
465f095dc4
|
市场业绩bug修正
|
4 years ago |
|
chenzhi
|
7a8b91c8f0
|
优化下游同游戏判断
|
4 years ago |
|
zhengyongxing
|
5c65f356b2
|
市场业绩开发类型修正
|
4 years ago |
|
zhengyongxing
|
7a021dced5
|
市场业绩提示语修正
|
4 years ago |
|
zhengyongxing
|
15ad0a902b
|
Merge branches 'feature/add_item' and 'release' of 47.111.118.107:wmtx/platform into feature/add_item
Conflicts:
Data/update.sql
|
4 years ago |
|
zhengyongxing
|
dab8251c11
|
Merge branches 'feature/company_export_change' and 'release' of 47.111.118.107:wmtx/platform into feature/company_export_change
Conflicts:
Application/Admin/Controller/AggregateFinanceStatementController.class.php
Data/update.sql
|
4 years ago |
|
万盟天下
|
9209c4fe38
|
Merge branch 'hotfix/change_game_0927' of wmtx/platform into release
优化删除游戏报错bug
|
4 years ago |
|
ELF
|
24fe97186e
|
修改
|
4 years ago |
|
chenzhi
|
c40e366a03
|
优化删除游戏报错bug
|
4 years ago |
|
chenzhi
|
02aa1bd088
|
优化1
|
4 years ago |
|
zhengyongxing
|
c9516b8751
|
未汇总汇总功能提交
|
4 years ago |
|
zhengyongxing
|
4b44356a6d
|
Revert "优化下游个人同游戏判断"
This reverts commit f22dc90e
|
4 years ago |
|
zhengyongxing
|
bc084fa2e1
|
汇总编辑小数点保留两位
|
4 years ago |
|
zhengyongxing
|
a86fab6bf6
|
聚合公司绑定功能修改
|
4 years ago |
|
zhengyongxing
|
984619e310
|
汇总审批撤回bug修改
|
4 years ago |
|
zhengyongxing
|
a19f668687
|
财务汇总功能撤回审批修改
|
4 years ago |
|
chenzhi
|
f22dc90e96
|
优化下游个人同游戏判断
|
4 years ago |
|
zhengyongxing
|
2cdc4e815b
|
下游公司cp比例修改
|
4 years ago |
|
zhengyongxing
|
28f73f3140
|
公司比例格式修改
|
4 years ago |
|
chenzhi
|
3ef485516f
|
优化工会游戏修改
|
4 years ago |
|
zhengyongxing
|
995a860016
|
汇总编辑功能修改
|
4 years ago |
|
zhengyongxing
|
c366fcfe4e
|
汇总编辑功能提交
|
4 years ago |
|
zhengyongxing
|
825d4e51c9
|
聚合公司绑定功能修改
|
4 years ago |
|
zhengyongxing
|
e8e190a7eb
|
聚合公司绑定功能修改
|
4 years ago |
|
zhengyongxing
|
4e9bde9c10
|
汇总编辑提交
|
4 years ago |
|
zhengyongxing
|
9a6bc50eca
|
聚合公司绑定编辑修改
|
4 years ago |
|
zhengyongxing
|
d937dbad55
|
聚合公司绑定功能修改
|
4 years ago |
|
zhengyongxing
|
31568dd37c
|
聚合公司汇总编辑功能添加
|
4 years ago |
|
zhengyongxing
|
14ad9ce93d
|
聚合公司绑定功能及汇总提示语添加
|
4 years ago |
|
zhengyongxing
|
4cf512779a
|
聚合公司绑定功能及汇总提示语添加
|
4 years ago |
|
zhengyongxing
|
868889fe54
|
汇总编辑功能提交
|
4 years ago |
|
zhengyongxing
|
58bd48997f
|
汇总编辑功能提交
|
4 years ago |
|
zhengyongxing
|
bc627cf224
|
汇总导出bug修改
|
4 years ago |
|
ELF
|
ad34536256
|
修改
|
4 years ago |
|
zhengyongxing
|
895b32cee8
|
汇总bug修改
|
4 years ago |
|
zhengyongxing
|
60210fedef
|
撤销汇总名词修改
|
4 years ago |
|
zhengyongxing
|
0b745ea817
|
个人汇总添加退款
|
4 years ago |
|
zhengyongxing
|
ee2304d664
|
结算性质名词修改
|
4 years ago |
|
zhengyongxing
|
fedcbd605b
|
bug修改
|
4 years ago |
|
ELF
|
6fcaa1362c
|
重置权限缓存
|
4 years ago |
|
zhengyongxing
|
ca03b8701f
|
聚合页面名称修改
|
4 years ago |
|
zhengyongxing
|
518c902b2a
|
发起汇总修正
|
4 years ago |
|
zhengyongxing
|
ceef36a7d1
|
内部公司功能完善
|
4 years ago |
|
zhengyongxing
|
ab9be65422
|
内部公司功能提交
|
4 years ago |
|
zhengyongxing
|
1f3b2d1ec7
|
Merge branch 'feature/new_item' of 47.111.118.107:wmtx/platform into feature/add_item
|
4 years ago |
|
zhengyongxing
|
0631c22c93
|
上游导出修正
|
4 years ago |
|
zyx
|
570e476efb
|
公司添加是否为内部公司
|
4 years ago |
|
zhengyongxing
|
deeb4b865b
|
聚合汇总单代码提交
|
4 years ago |
|
zhengyongxing
|
f95b593455
|
Merge remote-tracking branch 'origin/feature/company_export_change' into feature/company_export_change
# Conflicts:
# Application/Base/Tool/AggregateClient.class.php
# Data/update.sql
|
4 years ago |
|
zhengyongxing
|
400a9b3ded
|
上游导出修正
|
4 years ago |
|
zhengyongxing
|
3c698adba9
|
上游导出修正
|
4 years ago |
|
chenzhi
|
97af14147e
|
优化下游个人结算
|
4 years ago |
|
万盟天下
|
f52cf8947a
|
Merge branch 'hotfix/bug_change_now' of wmtx/platform into master
补点游戏生成多条及内充也计入
|
4 years ago |
|
zhengyongxing
|
cdb02aa821
|
补点游戏生成多条及内充也计入
|
4 years ago |
|
廖金灵
|
ef891050c9
|
Merge branch 'hotfix/platform_coin_fix' of wmtx/platform into release
修改bug
|
4 years ago |
|
ELF
|
baba28fe04
|
修改
|
4 years ago |
|
郑永星
|
55f98ca8c5
|
Merge branch 'hotfix/bug_change_now' of wmtx/platform into release
删除提示修正
|
4 years ago |
|
zhengyongxing
|
623361cbde
|
删除提示修正
|
4 years ago |
|
郑永星
|
77e8161159
|
Merge branch 'hotfix/bug_change_now' of wmtx/platform into release
汇总删除修正
|
4 years ago |
|
zhengyongxing
|
d35ce5694e
|
汇总删除修正
|
4 years ago |
|
zhengyongxing
|
f36469031e
|
删除修正
|
4 years ago |
|
zhengyongxing
|
c5e272fb36
|
删除功能修正
|
4 years ago |
陈志
|
5cb1963582
|
Merge branch 'feature/finance_statement_three' of wmtx/platform into release
优化推广公司添加排序
|
4 years ago |
|
chenzhi
|
f169d65c1c
|
优化推广公司添加排序
|
4 years ago |
|
廖金灵
|
f850a45913
|
Merge branch 'hotfix/platform_coin_fix' of wmtx/platform into release
优化推广后台资料专区
|
4 years ago |
|
ELF
|
a6d7adb87b
|
修改
|
4 years ago |
|
chenzhi
|
4a3cb6f6bb
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/finance_statement_three
|
4 years ago |
|
郑永星
|
7469d22c36
|
Merge branch 'hotfix/bug_change_now' of wmtx/platform into release
比例空字符判断
|
4 years ago |
|
zhengyongxing
|
9579919375
|
比例空字符判断
|
4 years ago |
|
郑永星
|
d272c17fc6
|
Merge branch 'hotfix/bug_change_now' of wmtx/platform into release
特殊补点比例修正
|
4 years ago |
|
zhengyongxing
|
c1222cd46a
|
特殊补点比例修正
|
4 years ago |
|
zhengyongxing
|
a5090c3793
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/bug_change_now_other
|
4 years ago |
|
zhengyongxing
|
7ef0f125c1
|
特殊补点删除功能提交
|
4 years ago |
|
zhengyongxing
|
47e373639d
|
Merge branch 'master' of 47.111.118.107:wmtx/platform into hotfix/bug_change_now
|
4 years ago |
|
廖金灵
|
6e34bf0dc0
|
Merge branch 'hotfix/bug_change_now' of wmtx/platform into release
公司支付宝打款修正
|
4 years ago |
|
zhengyongxing
|
ba1778c112
|
公司支付宝打款修正
|
4 years ago |
|
郑永星
|
c7ba3e3ba3
|
Merge branch 'hotfix/bug_change_now' of wmtx/platform into release
补点bug修正
|
4 years ago |
|
zhengyongxing
|
ab7ae80634
|
补点bug修正
|
4 years ago |
|
郑永星
|
2e4904861b
|
Merge branch 'hotfix/bug_change_now' of wmtx/platform into release
特殊补点功能bug修正
|
4 years ago |
|
zhengyongxing
|
65dc1dec9e
|
特殊补点功能bug修正
|
4 years ago |
|
chenzhi
|
7a135f1019
|
Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/finance_statement_three
|
4 years ago |
|
廖金灵
|
5e2c093ea4
|
Merge branch 'hotfix/payStatistic' of wmtx/platform into master
判定是否录入过修正
|
4 years ago |
|
郑永星
|
b65b8c6b2f
|
Merge branch 'hotfix/payStatistic' of wmtx/platform into release
判定是否录入过修正
|
4 years ago |
|
zhengyongxing
|
229d8d2a50
|
判定是否录入过修正
|
4 years ago |
|
郑永星
|
a80f68ef5e
|
Merge branch 'hotfix/payStatistic' of wmtx/platform into release
补点比例非负数修正
|
4 years ago |
|
zhengyongxing
|
df3b058b91
|
补点比例非负数修正
|
4 years ago |
|
廖金灵
|
9a2630093a
|
Merge branch 'hotfix/payStatistic' of wmtx/platform into master
补点功能修正
|
4 years ago |
|
郑永星
|
98563b686d
|
Merge branch 'hotfix/payStatistic' of wmtx/platform into release
补点功能修正
|
4 years ago |
|
zhengyongxing
|
c7af3bdb1d
|
补点功能修正
|
4 years ago |
|
chenzhi
|
bcdbb3d0a0
|
优化导出保留两位小数
|
4 years ago |
|
zhengyongxing
|
c0406a6f52
|
上游导出修正
|
4 years ago |
|
chenzhi
|
e085b6cc78
|
Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/finance_statement_three
|
4 years ago |
|
chenzhi
|
f73a9033b3
|
新增下游个人比例
|
4 years ago |
|
廖金灵
|
1b9aa5c87e
|
Merge branch 'hotfix/bug_change_now' of wmtx/platform into release
补点游戏有流水的就给予展示
|
4 years ago |
|
zhengyongxing
|
af5878a98f
|
补点游戏有流水的就给予展示
|
4 years ago |
|
廖金灵
|
de3477dd27
|
Merge branch 'hotfix/bug_change_now' of wmtx/platform into release
补点功能修正
|
4 years ago |
|
zhengyongxing
|
b39629fe08
|
补点功能修正
|
4 years ago |
|
郑永星
|
223c3a63f2
|
Merge branch 'hotfix/payStatistic' of wmtx/platform into release
支付渠道优化
|
4 years ago |
|
zhengyongxing
|
64e2517b93
|
支付渠道优化
|
4 years ago |
|
chenzhi
|
329c5696d6
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/finance_statement_three
|
4 years ago |
|
chenzhi
|
d7b9a0ac1a
|
优化允许撤销汇总进行直接汇总
|
4 years ago |
|
郑永星
|
c9497ee3f3
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
比例格式修正
|
4 years ago |
|
zhengyongxing
|
3adf8a93f8
|
比例格式修正
|
4 years ago |
|
chenzhi
|
e10b27a067
|
优化下游内团江息网络归属
|
4 years ago |
|
万盟天下
|
956d6c35a7
|
Merge branch 'feature/promote_company_merge' of wmtx/platform into master
优化
|
4 years ago |
|
万盟天下
|
9d6b18009a
|
Merge branch 'feature/promote_company_merge' of wmtx/platform into release
优化
|
4 years ago |
|
ELF
|
4bb7015e1b
|
测试
|
4 years ago |
|
万盟天下
|
25c06c4b2d
|
Merge branch 'feature/promote_company_merge' of wmtx/platform into release
修改功能
|
4 years ago |
|
万盟天下
|
eb7346c4a9
|
Merge branch 'feature/promote_company_merge' of wmtx/platform into master
权限优化
|
4 years ago |
|
ELF
|
f37f6c51dd
|
修改功能
|
4 years ago |
|
万盟天下
|
c60d7c6671
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into master
上游导出修正
|
4 years ago |
|
郑永星
|
1d3db74b53
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
上游导出修正
|
4 years ago |
|
zhengyongxing
|
288078c959
|
上游导出修正
|
4 years ago |
|
chenzhi
|
2ff538886c
|
优化上游结算
|
4 years ago |
|
郑永星
|
700841fe7f
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
特殊补点与其他汇总重算功能区分添加限制
|
4 years ago |
|
chenzhi
|
75c7b635b6
|
优化上游结算检索
|
4 years ago |
|
万盟天下
|
ae44e80233
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into master
特殊补点与其他汇总重算功能区分添加限制
|
4 years ago |
|
zhengyongxing
|
7a04411e4d
|
特殊补点与其他汇总重算功能区分添加限制
|
4 years ago |
|
万盟天下
|
e130228c39
|
Merge branch 'feature/promote_company_merge' of wmtx/platform into release
优化
|
4 years ago |
|
万盟天下
|
2f0ecf6302
|
Merge branch 'feature/promote_company_merge' of wmtx/platform into master
修改bug
|
4 years ago |
|
ELF
|
8f4b86ee2e
|
优化
|
4 years ago |
|
郑永星
|
7a9a12f99c
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
特殊补点无法重算限制
|
4 years ago |
|
zhengyongxing
|
e94994993a
|
特殊补点无法重算限制
|
4 years ago |
|
郑永星
|
c4ea44c3f8
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
特殊补点权限
|
4 years ago |
|
廖金灵
|
ef5c95f49a
|
Merge branch 'feature/promote_company_merge' of wmtx/platform into release
优化
|
4 years ago |
|
廖金灵
|
548c76bd99
|
Merge branch 'feature/promote_company_merge' of wmtx/platform into master
优化
|
4 years ago |
|
ELF
|
1b949af7f5
|
优化
|
4 years ago |
|
廖金灵
|
cf821ae447
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into master
特殊补点权限
|
4 years ago |
|
zhengyongxing
|
ba80668560
|
特殊补点权限
|
4 years ago |
|
chenzhi
|
9c11344906
|
优化下游推广公司导出
|
4 years ago |
|
郑永星
|
3310553654
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
比例格式修正
|
4 years ago |
|
zhengyongxing
|
1c08d1a221
|
比例格式修正
|
4 years ago |
|
郑永星
|
10e50b4bec
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
比例与日期格式修正
|
4 years ago |
|
zhengyongxing
|
f18f3ce7e2
|
比例与日期格式修正
|
4 years ago |
|
陈志
|
0c696fd8a5
|
Merge branch 'feature/promote_company_merge' of wmtx/platform into release
修改
|
4 years ago |
|
陈志
|
4813e28fec
|
Merge branch 'feature/finance_statement_three' of wmtx/platform into release
优化汇总说明
|
4 years ago |
|
郑永星
|
ff1117c0b7
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
小bug修改
|
4 years ago |
|
zhengyongxing
|
5acd5197ae
|
小bug修改
|
4 years ago |
|
chenzhi
|
b899ff7af7
|
优化汇总说明
|
4 years ago |
|
ELF
|
bdc23b7d90
|
修改
|
4 years ago |
|
廖金灵
|
a6bc59dd53
|
Merge branch 'feature/promote_company_merge' of wmtx/platform into release
测试
|
4 years ago |
|
ELF
|
1e5c0cca66
|
测试
|
4 years ago |
|
廖金灵
|
de9367618b
|
Merge branch 'feature/agg_game_fail' of wmtx/platform into release
优化
|
4 years ago |
|
ELF
|
1fb2fa7e81
|
解决冲突
|
4 years ago |
|
ELF
|
8d98bd5a36
|
优化
|
4 years ago |
|
ELF
|
d123f7b779
|
优化
|
4 years ago |
|
廖金灵
|
6a78824b10
|
Merge branch 'feature/promote_company_merge' of wmtx/platform into release
修改
|
4 years ago |
|
郑永星
|
e554d9c288
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
特殊补点加入下游结算中
|
4 years ago |
|
zhengyongxing
|
19c7f7db0d
|
特殊补点加入下游结算中
|
4 years ago |
|
郑永星
|
1aebf2b939
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
特殊补点分成金额功能修正
|
4 years ago |
|
zhengyongxing
|
eac0fc61c0
|
特殊补点分成金额功能修正
|
4 years ago |
|
ELF
|
268e084241
|
修改
|
4 years ago |
|
陈志
|
e1db5c9a47
|
Merge branch 'feature/finance_statement_three' of wmtx/platform into release
优化重算按钮的出现
|
4 years ago |
|
chenzhi
|
ae9d7f7574
|
优化重算按钮的出现
|
4 years ago |
|
郑永星
|
7c5ec40288
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
特殊补点bug修正
|
4 years ago |
|
zhengyongxing
|
a29a8e43ff
|
特殊补点bug修正
|
4 years ago |
|
chenzhi
|
175b2f92f7
|
优化绑定币搜索
|
4 years ago |
|
廖金灵
|
931c837d7e
|
Merge branch 'feature/promote_company_merge' of wmtx/platform into release
优化
|
4 years ago |
|
ELF
|
9d67a4c842
|
优化
|
4 years ago |
|
郑永星
|
e3850d18f5
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
平台结算导出与列表选项修改
|
4 years ago |
|
zhengyongxing
|
a146dd820a
|
平台结算导出与列表选项修改
|
4 years ago |
|
chenzhi
|
8baab09004
|
优化备注
|
4 years ago |
|
陈志
|
aa2feb7e1e
|
Merge branch 'feature/finance_statement_three' of wmtx/platform into release
优化海南结算
|
4 years ago |
|
chenzhi
|
927c5b8595
|
优化海南结算
|
4 years ago |
|
chenzhi
|
a3a3505894
|
新增官方渠道结算
|
4 years ago |
|
郑永星
|
9f0f9b7951
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
市场专员业绩下游流水及特殊补点功能提交
|
4 years ago |
|
zhengyongxing
|
b14d2d197c
|
市场专员业绩下游流水及特殊补点功能提交
|
4 years ago |
|
廖金灵
|
d29ec01ab6
|
Merge branch 'feature/agg_game_fail' of wmtx/platform into release
修改
|
4 years ago |
|
ELF
|
b9779df6b1
|
修改
|
4 years ago |
|
廖金灵
|
429ded27b8
|
Merge branch 'feature/agg_game_fail' of wmtx/platform into release
修改
|
4 years ago |
|
ELF
|
0ff1089682
|
修改
|
4 years ago |
|
廖金灵
|
c633109176
|
Merge branch 'feature/agg_game_fail' of wmtx/platform into release
留存率不区分设备
|
4 years ago |
|
ELF
|
619e1de3f3
|
留存率不区分设备
|
4 years ago |
|
陈志
|
c1fbda369b
|
Merge branch 'feature/finance_statement_three' of wmtx/platform into release
优化财务汇总测试收入
|
4 years ago |
|
廖金灵
|
7436e7c89d
|
Merge branch 'feature/agg_game_fail' of wmtx/platform into release
测试订单优化
|
4 years ago |
|
ELF
|
3c3222ad26
|
测试订单优化
|
4 years ago |
|
chenzhi
|
eb2cd7d50f
|
优化财务汇总测试收入
|
4 years ago |
|
陈志
|
3628dd630e
|
Merge branch 'feature/company_export_change' of wmtx/platform into release
上游导出修正
|
4 years ago |
|
陈志
|
d130e6cf6d
|
Merge branch 'feature/finance_statement_three' of wmtx/platform into release
优化个人汇总导出异常
|
4 years ago |
|
chenzhi
|
f405faa924
|
优化个人汇总导出异常
|
4 years ago |
|
陈志
|
053d1de648
|
Merge branch 'feature/finance_statement_three' of wmtx/platform into release
优化个人结算
|
4 years ago |
|
chenzhi
|
1a55fbce69
|
优化个人结算
|
4 years ago |