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 |
郑永星
|
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 |
廖金灵
|
a2a9625933
|
Merge branch 'feature/add_item' of wmtx/platform into master
聚合公司汇总公司添加,公司绑定编辑开放
|
4 years ago |
郑永星
|
d7edb41f44
|
Merge branch 'feature/add_item' of wmtx/platform into release
汇总bug修正
|
4 years ago |
zhengyongxing
|
01df95637a
|
汇总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 |
chenzhi
|
f311da5208
|
优化银行卡号不限制
|
4 years ago |
zyx
|
5bec0ba91c
|
汇总状态的操作修改
|
4 years ago |
zyx
|
c99cad808c
|
汇总状态的操作修改
|
4 years ago |
zyx
|
041006e1b4
|
汇总状态的操作修改
|
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 |
万盟天下
|
9db2434d10
|
Merge branch 'feature/add_item' of wmtx/platform into master
聚合公司绑定流程优化
|
4 years ago |
zhengyongxing
|
2b4ed15a30
|
聚合公司绑定流程优化
|
4 years ago |
万盟天下
|
1cb13ebb4c
|
Merge branch 'feature/add_item' of wmtx/platform into master
聚合汇总bug修正
|
4 years ago |
zhengyongxing
|
a2b085562d
|
聚合汇总bug修正
|
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 |
zhengyongxing
|
c06e53ab31
|
汇总bug修正
|
4 years ago |
zhengyongxing
|
1e67b1d1a1
|
汇总bug修正
|
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 |
zhengyongxing
|
5c65f356b2
|
市场业绩开发类型修正
|
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 |
zhengyongxing
|
bc084fa2e1
|
汇总编辑小数点保留两位
|
4 years ago |
zhengyongxing
|
a86fab6bf6
|
聚合公司绑定功能修改
|
4 years ago |
zhengyongxing
|
984619e310
|
汇总审批撤回bug修改
|
4 years ago |
zhengyongxing
|
a19f668687
|
财务汇总功能撤回审批修改
|
4 years ago |
zhengyongxing
|
2cdc4e815b
|
下游公司cp比例修改
|
4 years ago |
zhengyongxing
|
28f73f3140
|
公司比例格式修改
|
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
|
4cf512779a
|
聚合公司绑定功能及汇总提示语添加
|
4 years ago |
zhengyongxing
|
868889fe54
|
汇总编辑功能提交
|
4 years ago |
zhengyongxing
|
58bd48997f
|
汇总编辑功能提交
|
4 years ago |
ELF
|
ad34536256
|
修改
|
4 years ago |
zhengyongxing
|
0b745ea817
|
个人汇总添加退款
|
4 years ago |
zhengyongxing
|
ee2304d664
|
结算性质名词修改
|
4 years ago |
zhengyongxing
|
fedcbd605b
|
bug修改
|
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 |
廖金灵
|
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 |
廖金灵
|
f850a45913
|
Merge branch 'hotfix/platform_coin_fix' of wmtx/platform into release
优化推广后台资料专区
|
4 years ago |
ELF
|
a6d7adb87b
|
修改
|
4 years ago |
zhengyongxing
|
9579919375
|
比例空字符判断
|
4 years ago |
zhengyongxing
|
c1222cd46a
|
特殊补点比例修正
|
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 |
zhengyongxing
|
ba1778c112
|
公司支付宝打款修正
|
4 years ago |
廖金灵
|
5e2c093ea4
|
Merge branch 'hotfix/payStatistic' of wmtx/platform into master
判定是否录入过修正
|
4 years ago |
zhengyongxing
|
df3b058b91
|
补点比例非负数修正
|
4 years ago |
廖金灵
|
9a2630093a
|
Merge branch 'hotfix/payStatistic' of wmtx/platform into master
补点功能修正
|
4 years ago |
zhengyongxing
|
c7af3bdb1d
|
补点功能修正
|
4 years ago |
zhengyongxing
|
af5878a98f
|
补点游戏有流水的就给予展示
|
4 years ago |
zhengyongxing
|
64e2517b93
|
支付渠道优化
|
4 years ago |
chenzhi
|
d7b9a0ac1a
|
优化允许撤销汇总进行直接汇总
|
4 years ago |
万盟天下
|
ae44e80233
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into master
特殊补点与其他汇总重算功能区分添加限制
|
4 years ago |
zhengyongxing
|
7a04411e4d
|
特殊补点与其他汇总重算功能区分添加限制
|
4 years ago |
万盟天下
|
2f0ecf6302
|
Merge branch 'feature/promote_company_merge' of wmtx/platform into master
修改bug
|
4 years ago |
ELF
|
8f4b86ee2e
|
优化
|
4 years ago |
zhengyongxing
|
e94994993a
|
特殊补点无法重算限制
|
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 |
郑永星
|
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 |
郑永星
|
ff1117c0b7
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
小bug修改
|
4 years ago |
zhengyongxing
|
5acd5197ae
|
小bug修改
|
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 |
陈志
|
e1db5c9a47
|
Merge branch 'feature/finance_statement_three' of wmtx/platform into release
优化重算按钮的出现
|
4 years ago |
chenzhi
|
ae9d7f7574
|
优化重算按钮的出现
|
4 years ago |
chenzhi
|
175b2f92f7
|
优化绑定币搜索
|
4 years ago |
郑永星
|
e3850d18f5
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
平台结算导出与列表选项修改
|
4 years ago |
zhengyongxing
|
a146dd820a
|
平台结算导出与列表选项修改
|
4 years ago |
廖金灵
|
429ded27b8
|
Merge branch 'feature/agg_game_fail' of wmtx/platform into release
修改
|
4 years ago |
ELF
|
0ff1089682
|
修改
|
4 years ago |
廖金灵
|
7436e7c89d
|
Merge branch 'feature/agg_game_fail' of wmtx/platform into release
测试订单优化
|
4 years ago |
ELF
|
3c3222ad26
|
测试订单优化
|
4 years ago |
陈志
|
3628dd630e
|
Merge branch 'feature/company_export_change' of wmtx/platform into release
上游导出修正
|
4 years ago |
廖金灵
|
151fa30be5
|
Merge branch 'feature/agg_game_fail' of wmtx/platform into release
聚合订单查询
|
4 years ago |
ELF
|
a18e4188bd
|
修改bug
|
4 years ago |
zhengyongxing
|
ae8cf5ad38
|
上游导出修正
|
4 years ago |
郑永星
|
7f3de4d901
|
Merge branch 'feature/company_export_change' of wmtx/platform into release
下游导出修正
|
4 years ago |
zhengyongxing
|
f0c425ae82
|
下游导出修正
|
4 years ago |
郑永星
|
0010a39c76
|
Merge branch 'feature/company_export_change' of wmtx/platform into release
|
4 years ago |
zhengyongxing
|
3c6418425a
|
上游导出修正
|
4 years ago |
廖金灵
|
c9b1326c42
|
Merge branch 'feature/promote_company_merge' of wmtx/platform into release
修改
|
4 years ago |
ELF
|
6596e01a29
|
修改
|
4 years ago |
zhengyongxing
|
65532fc0ab
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/company_export_change_other
Conflicts:
Application/Admin/Controller/PromoteCompanyController.class.php
Application/Base/Tool/AggregateClient.class.php
|
4 years ago |
ELF
|
6e2fda1e26
|
解决冲突
|
4 years ago |
廖金灵
|
3690b7d000
|
Merge branch 'feature/agg_game_fail' of wmtx/platform into release
游戏统计/聚合订单数据相同
|
4 years ago |
zhengyongxing
|
23555f8d4d
|
特殊补点功能修改
|
4 years ago |
chenzhi
|
9234919180
|
优化导出
|
4 years ago |
chenzhi
|
6cb4ecb930
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/finance_statement_three
|
4 years ago |
zhengyongxing
|
4ed51cb112
|
上下游聚合打款信息修改
|
4 years ago |
chenzhi
|
c795e5de6c
|
优化下游个人汇总样式
|
4 years ago |
zhengyongxing
|
f4aeae340d
|
特殊补点功能修正
|
4 years ago |
zhengyongxing
|
565d3c9576
|
特殊补点功能修改
|
4 years ago |
zhengyongxing
|
73dff8839e
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
Conflicts:
Application/Admin/Controller/CompanyStatementPoolController.class.php
|
4 years ago |
chenzhi
|
ce5a83e9bc
|
优化汇总导出错误
|
4 years ago |
zhengyongxing
|
6103908d83
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
Conflicts:
Application/Admin/Controller/CompanyStatementController.class.php
Application/Admin/Controller/CompanyStatementPoolController.class.php
|
4 years ago |
zhengyongxing
|
872de1ff73
|
上下游聚合打款信息修改
|
4 years ago |
zhengyongxing
|
b75e0725a1
|
特殊补点功能修改
|
4 years ago |
zhengyongxing
|
9265d7c9b6
|
上下游聚合打款信息修改
|
4 years ago |
ELF
|
1fbb9f097e
|
ss
|
4 years ago |
ELF
|
53f2649d9a
|
ss
|
4 years ago |