郑永星
|
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 |