zhengyongxing
|
eb8c9cebc1
|
3.22好功能提交
|
4 years ago |
chenzhi
|
7ed2855dc5
|
优化重算
|
4 years ago |
|
chenzhi
|
aa99f1f668
|
新增审核撤回
|
4 years ago |
|
zhengyongxing
|
3900a4081a
|
财务子系统bug修复
|
4 years ago |
|
zhengyongxing
|
ae3ad391fd
|
新功能开发
|
4 years ago |
|
zhengyongxing
|
a84a69fd56
|
热更修复
|
4 years ago |
|
zhengyongxing
|
55c75e159c
|
热更修复
|
4 years ago |
|
zhengyongxing
|
1ec35eeb32
|
2.28号功能提交
|
4 years ago |
|
zhengyongxing
|
0be51f4d62
|
2.28号功能提交
|
4 years ago |
郑永星
|
dfdcedea38
|
Merge pull request '2.28号功能提交' (#176) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/176
|
4 years ago |
|
zhengyongxing
|
016c2e11bd
|
2.28号功能提交
|
4 years ago |
|
chenzhi
|
a889417f5a
|
Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115
|
4 years ago |
|
zhengyongxing
|
4425750972
|
2.28号功能提交
|
4 years ago |
|
chenzhi
|
b75bcdbb1c
|
新增上游导出查看
|
4 years ago |
|
zhengyongxing
|
92d6f504e8
|
2.7号功能提交
|
4 years ago |
|
zhengyongxing
|
347facea89
|
2.7号功能提交
|
4 years ago |
|
zhengyongxing
|
53ba2c7698
|
2.7号功能提交
|
4 years ago |
 廖金灵
|
c7a22ce7dd
|
Merge pull request '特殊补点导出修正' (#89) from feature/add_item_two into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/89
|
4 years ago |
|
zhengyongxing
|
7054f82fde
|
特殊补点导出修正
|
4 years ago |
|
chenzhi
|
8ef35174dc
|
优化个人补点
|
4 years ago |
|
zhengyongxing
|
08dd238ca4
|
特殊补点用户名修正
|
4 years ago |
|
chenzhi
|
d029e4562d
|
优化上游
|
4 years ago |
|
chenzhi
|
6f90b18be9
|
优化上游pool
|
4 years ago |
|
zhengyongxing
|
d9b37792fd
|
特殊补点bug修正
|
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
|
fedcbd605b
|
bug修改
|
4 years ago |
|
zhengyongxing
|
ceef36a7d1
|
内部公司功能完善
|
4 years ago |
|
zhengyongxing
|
0631c22c93
|
上游导出修正
|
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
|
3c698adba9
|
上游导出修正
|
4 years ago |
万盟天下
|
f52cf8947a
|
Merge branch 'hotfix/bug_change_now' of wmtx/platform into master
补点游戏生成多条及内充也计入
|
4 years ago |
郑永星
|
3a03b2ba10
|
Merge branch 'hotfix/bug_change_now' of wmtx/platform into release
补点游戏生成多条及内充也计入
|
4 years ago |
|
zhengyongxing
|
cdb02aa821
|
补点游戏生成多条及内充也计入
|
4 years ago |
|
郑永星
|
77e8161159
|
Merge branch 'hotfix/bug_change_now' of wmtx/platform into release
汇总删除修正
|
4 years ago |
|
zhengyongxing
|
c5e272fb36
|
删除功能修正
|
4 years ago |
|
chenzhi
|
f169d65c1c
|
优化推广公司添加排序
|
4 years ago |
|
chenzhi
|
4a3cb6f6bb
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/finance_statement_three
|
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
|
ab7ae80634
|
补点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 |
|
zhengyongxing
|
229d8d2a50
|
判定是否录入过修正
|
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 |
|
chenzhi
|
bcdbb3d0a0
|
优化导出保留两位小数
|
4 years ago |
|
zhengyongxing
|
b39629fe08
|
补点功能修正
|
4 years ago |