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
|
5 years ago |
|
zhengyongxing
|
9a6bc50eca
|
聚合公司绑定编辑修改
|
5 years ago |
|
zhengyongxing
|
d937dbad55
|
聚合公司绑定功能修改
|
5 years ago |
|
zhengyongxing
|
4cf512779a
|
聚合公司绑定功能及汇总提示语添加
|
5 years ago |
|
zhengyongxing
|
ee2304d664
|
结算性质名词修改
|
5 years ago |
|
zhengyongxing
|
ca03b8701f
|
聚合页面名称修改
|
5 years ago |
|
zhengyongxing
|
518c902b2a
|
发起汇总修正
|
5 years ago |
|
zhengyongxing
|
deeb4b865b
|
聚合汇总单代码提交
|
5 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
|
5 years ago |
|
zhengyongxing
|
400a9b3ded
|
上游导出修正
|
5 years ago |
|
zhengyongxing
|
3c698adba9
|
上游导出修正
|
5 years ago |
 廖金灵
|
ef891050c9
|
Merge branch 'hotfix/platform_coin_fix' of wmtx/platform into release
修改bug
|
5 years ago |
|
ELF
|
baba28fe04
|
修改
|
5 years ago |
郑永星
|
55f98ca8c5
|
Merge branch 'hotfix/bug_change_now' of wmtx/platform into release
删除提示修正
|
5 years ago |
|
zhengyongxing
|
623361cbde
|
删除提示修正
|
5 years ago |
|
郑永星
|
77e8161159
|
Merge branch 'hotfix/bug_change_now' of wmtx/platform into release
汇总删除修正
|
5 years ago |
|
zhengyongxing
|
d35ce5694e
|
汇总删除修正
|
5 years ago |
|
zhengyongxing
|
f36469031e
|
删除修正
|
5 years ago |
|
廖金灵
|
f850a45913
|
Merge branch 'hotfix/platform_coin_fix' of wmtx/platform into release
优化推广后台资料专区
|
5 years ago |
|
ELF
|
a6d7adb87b
|
修改
|
5 years ago |
|
zhengyongxing
|
9579919375
|
比例空字符判断
|
5 years ago |
|
zhengyongxing
|
c1222cd46a
|
特殊补点比例修正
|
5 years ago |
|
zhengyongxing
|
7ef0f125c1
|
特殊补点删除功能提交
|
5 years ago |
|
zhengyongxing
|
47e373639d
|
Merge branch 'master' of 47.111.118.107:wmtx/platform into hotfix/bug_change_now
|
5 years ago |
|
zhengyongxing
|
ba1778c112
|
公司支付宝打款修正
|
5 years ago |
|
廖金灵
|
5e2c093ea4
|
Merge branch 'hotfix/payStatistic' of wmtx/platform into master
判定是否录入过修正
|
5 years ago |
|
zhengyongxing
|
df3b058b91
|
补点比例非负数修正
|
5 years ago |
|
廖金灵
|
9a2630093a
|
Merge branch 'hotfix/payStatistic' of wmtx/platform into master
补点功能修正
|
5 years ago |
|
zhengyongxing
|
c7af3bdb1d
|
补点功能修正
|
5 years ago |
|
zhengyongxing
|
af5878a98f
|
补点游戏有流水的就给予展示
|
5 years ago |
|
zhengyongxing
|
64e2517b93
|
支付渠道优化
|
5 years ago |
chenzhi
|
d7b9a0ac1a
|
优化允许撤销汇总进行直接汇总
|
5 years ago |
万盟天下
|
ae44e80233
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into master
特殊补点与其他汇总重算功能区分添加限制
|
5 years ago |
|
zhengyongxing
|
7a04411e4d
|
特殊补点与其他汇总重算功能区分添加限制
|
5 years ago |
|
万盟天下
|
2f0ecf6302
|
Merge branch 'feature/promote_company_merge' of wmtx/platform into master
修改bug
|
5 years ago |
|
ELF
|
8f4b86ee2e
|
优化
|
5 years ago |
|
zhengyongxing
|
e94994993a
|
特殊补点无法重算限制
|
5 years ago |
|
廖金灵
|
548c76bd99
|
Merge branch 'feature/promote_company_merge' of wmtx/platform into master
优化
|
5 years ago |
|
ELF
|
1b949af7f5
|
优化
|
5 years ago |
|
廖金灵
|
cf821ae447
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into master
特殊补点权限
|
5 years ago |
|
zhengyongxing
|
ba80668560
|
特殊补点权限
|
5 years ago |
|
chenzhi
|
9c11344906
|
优化下游推广公司导出
|
5 years ago |
|
郑永星
|
10e50b4bec
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
比例与日期格式修正
|
5 years ago |
|
zhengyongxing
|
f18f3ce7e2
|
比例与日期格式修正
|
5 years ago |
陈志
|
0c696fd8a5
|
Merge branch 'feature/promote_company_merge' of wmtx/platform into release
修改
|
5 years ago |
|
郑永星
|
ff1117c0b7
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
小bug修改
|
5 years ago |
|
zhengyongxing
|
5acd5197ae
|
小bug修改
|
5 years ago |
|
ELF
|
bdc23b7d90
|
修改
|
5 years ago |
|
廖金灵
|
a6bc59dd53
|
Merge branch 'feature/promote_company_merge' of wmtx/platform into release
测试
|
5 years ago |
|
ELF
|
1e5c0cca66
|
测试
|
5 years ago |