elf
/
cf-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,419 Commits
1 Branch
0 Tags
154 MiB
master
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'cd1f84fb37'
${ noResults }
Commit Graph

6359 Commits (cd1f84fb378bf3093d9e82cacf51c84b7c235218)

Author SHA1 Message Date
张谷成 5410a1cb2e Merge pull request '时间格式' (#61) from feature/1228zgc into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/61
 4 years ago
tping 98ebb36aa3 时间格式 4 years ago
chenzhi 1b0124606a 优化市场结算脚本 4 years ago
张谷成 049f08af72 Merge pull request '优化' (#59) from feature/1228zgc into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/59
 4 years ago
tping e3f020965d 优化 4 years ago
张谷成 5de3b95d54 Merge pull request '优化' (#58) from feature/1228zgc into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/58
 4 years ago
tping b4c3b64fb0 优化 4 years ago
张谷成 2123ad9ef4 Merge pull request '优化' (#57) from feature/1228zgc into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/57
 4 years ago
tping e57a5f8e50 优化 4 years ago
chenzhi 382f2527a0 优化新增条件 4 years ago
张谷成 a97e94fc21 Merge pull request '1' (#56) from feature/1228zgc into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/56
 4 years ago
tping ee34cc86f5 1 4 years ago
郑永星 a6812d26e4 Merge pull request '短信验证万能验证码注释' (#55) from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/55
 4 years ago
chenzhi c5bc599289 优化游戏统计 4 years ago
zhengyongxing f5e2adb860 短信验证万能验证码注释 4 years ago
chenzhi 813aebfd64 优化统计 4 years ago
郑永星 c62ad6e69d Merge pull request '12.28功能提交' (#54) from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/54
 4 years ago
zhengyongxing 9c0006ef45 12.28功能提交 4 years ago
郑永星 a9aca61c73 Merge pull request '12.28功能提交' (#53) from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/53
 4 years ago
zhengyongxing f855835501 12.28功能提交 4 years ago
chenzhi 7ccf5e5857 Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/more_finance_20201211 4 years ago
郑永星 444cff5f64 Merge pull request '12.28功能提交' (#52) from feature/add_item into release 
12.28功能提交
 4 years ago
zhengyongxing d1b0ec55a8 12.28功能提交 4 years ago
郑永星 1496fa349a Merge pull request '12.28功能提交' (#51) from feature/add_item into release 
12.28功能提交
 4 years ago
zhengyongxing 0293fd7ff1 12.28功能提交 4 years ago
chenzhi f0829e84cc 优化统计 4 years ago
zhengyongxing bb73235874 12.28功能提交 4 years ago
郑永星 12434fb840 Merge pull request 'feature/add_item' (#50) from feature/add_item into release 
12.28功能提交
 4 years ago
chenzhi be8a30a2e8 合并 4 years ago
chenzhi b1a34cc9a0 优化不打款汇总 4 years ago
zhengyongxing e84ce56293 12.28功能提交 4 years ago
chenzhi 19f7406298 优化结算 4 years ago
万盟天下 459026d842 Merge pull request '修改bug' (#49) from feature/leniu_testing_resource into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/49
 4 years ago
ELF a70bffaee3 修改bug 4 years ago
万盟天下 4917d4806f Merge pull request '调试bug' (#48) from feature/leniu_testing_resource into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/48
 4 years ago
ELF 4f4929ad72 修改 4 years ago
万盟天下 9ded6cb0bd Merge pull request '剑仙诀添加资源发放接口' (#47) from feature/leniu_testing_resource into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/47
 4 years ago
chenzhi 6aeb73b759 优化财务汇总 4 years ago
ELF 932a082134 剑仙诀添加资源发放接口 4 years ago
chenzhi 90de336434 优化数据 4 years ago
zhengyongxing 08d235c03a 12.28功能提交 4 years ago
zhengyongxing 3c166a913e Merge branch 'feature/update_payment' into feature/add_item 
# Conflicts:
#	Application/Admin/Controller/CompanyStatementOfflineController.class.php
#	Application/Admin/Controller/StatementMangementController.class.php
#	Application/Payment/Controller/PaymentController.class.php
#	Application/Payment/View/Payment/lists.html
#	Data/update.sql
 4 years ago
chenzhi b6c87bfefe 优化首页 4 years ago
张谷成 1c1ef2e6a9 Merge pull request 'feature/1228zgc' (#46) from feature/1228zgc into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/46
 4 years ago
郑永星 cd2d9b3bc2 Merge pull request '12.28功能提交' (#44) from feature/update_payment into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/44
 4 years ago
zhengyongxing e0f17ea195 12.28功能提交 4 years ago
chenzhi 0e54b1c376 优化渠道和测试服订单 4 years ago
郑永星 11c7c542f8 Merge pull request '12.28功能提交' (#43) from feature/update_payment into release 
12.28功能提交
 4 years ago
zhengyongxing d0ee96f7b5 12.28功能提交 4 years ago
郑永星 db487f1033 Merge pull request 'feature/update_payment' (#42) from feature/update_payment into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/42
 4 years ago
zhengyongxing ac70fd3f79 12.28功能提交 4 years ago
zhengyongxing f4027b75b3 12.28功能提交 4 years ago
zhengyongxing eb8478fbb7 12.28功能提交 4 years ago
郑永星 21f957f46f Merge pull request '12.28功能提交' (#41) from feature/update_payment into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/41
 4 years ago
zhengyongxing 08153a8359 12.28功能提交 4 years ago
郑永星 ad7dc1f46d Merge pull request 'feature/update_payment' (#40) from feature/update_payment into release 
12.28功能提交
 4 years ago
zhengyongxing ffa78964ec 12.28功能提交 4 years ago
zhengyongxing 29e8421266 12.28功能提交 4 years ago
zhengyongxing 4f2f18ad91 12.28功能提交 4 years ago
zhengyongxing 82592dd457 12.28功能提交 4 years ago
zhengyongxing c8914800c7 12.28功能提交 4 years ago
zhengyongxing c716535975 12.28功能提交 4 years ago
zhengyongxing 552a6f8181 12.28功能提交 4 years ago
zhengyongxing 6a86a5e76f 12.18功打款能提交 4 years ago
chenzhi 9ab8454970 优化结算汇总 4 years ago
zhengyongxing 8a6191810b 12.18功打款能提交 4 years ago
chenzhi 40005b7177 优化游戏统计 4 years ago
tping ccf0589e4f 导入 4 years ago
chenzhi c0926299dc 优化平台币充值 4 years ago
tping 824b7b3f06 公会信息导入导出 4 years ago
chenzhi fa9dc518d5 导出 4 years ago
chenzhi 4fdb94c617 优化订单查询 4 years ago
chenzhi 45d883e89c 优化渠道统计 4 years ago
zhengyongxing 7c4e0e7521 12.18功能提交 4 years ago
zhengyongxing 8430fa1813 12.18功能提交 4 years ago
chenzhi 19c62de87c 優化公會統計 4 years ago
张谷成 e669d1bc38 Merge pull request '刷新' (#38) from hotfix/1211bug into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/38
 4 years ago
tping 6e63176176 刷新 4 years ago
tping 24fcfc4b90 公会信息 4 years ago
张谷成 a7553cf116 Merge pull request '1' (#36) from hotfix/1211bug into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/36
 4 years ago
tping 1dbc61a602 1 4 years ago
tping 0f7b23ad57 1 4 years ago
张谷成 0c7e4b2d30 Merge pull request 'hotfix/1211bug' (#35) from hotfix/1211bug into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/35
 4 years ago
tping 858e929199 甲乙方公司 4 years ago
tping 304c59be10 甲乙方公司 4 years ago
tping 08df25eab3 展示错误 4 years ago
tping d6f34127df 1 4 years ago
chenzhi 5b5029d570 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/more_finance_20201211 4 years ago
chenzhi 5f0d0a7101 优化游戏统计导出 4 years ago
chenzhi c5bc21cb36 优化游戏导出 4 years ago
chenzhi f00ef7fcc9 优化导出 4 years ago
chenzhi 236bd8f538 优化财务游戏汇总 4 years ago
chenzhi 76874cf34a 优化游戏统计 4 years ago
张谷成 91701cc612 Merge pull request '公会信息' (#34) from feature/1228zgc into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/34
 4 years ago
廖金灵 feb46d1954 Merge pull request 'feature/add_item_two' (#33) from feature/add_item_two into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/33
 4 years ago
zhengyongxing 87c6c71d0a 汇总bug修改 4 years ago
zhengyongxing 699449a702 未结算数据的补充 4 years ago
zhengyongxing 0c49d1d655 Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/add_item_two 4 years ago
zhengyongxing c30e396b2c 未结算数据的补充 4 years ago
zhengyongxing 32abdbb390 汇总统计修改 4 years ago
chenzhi fc75b7d81d 优化统计 4 years ago
chenzhi 79588d52e8 优化财务汇总 4 years ago
chenzhi 8ef35174dc 优化个人补点 4 years ago
chenzhi ad73fe03b3 优化上游结算 4 years ago
chenzhi 419793d91b 优化上游结算 4 years ago
tping 0aef9e3019 公会信息 4 years ago
chenzhi e6af0fbcd5 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/more_finance_20201211 4 years ago
chenzhi b7cc3ccd77 优化权限 4 years ago
ELF 9f61cdade9 Merge branch 'master' of 8.136.139.249:wmtx/platform into release 4 years ago
chenzhi 3fdc14120f 优化首页折线 4 years ago
郑永星 9d93f9d56f Merge pull request '未结算数据的补充' (#25) from feature/add_item into release 
未结算数据的补充
 4 years ago
zhengyongxing 77678249bf 未结算数据的补充 4 years ago
郑永星 bbfc5f64b8 Merge pull request 'feature/add_item' (#24) from feature/add_item into release 
未结算数据的补充
 4 years ago
zhengyongxing 84efc4d76d 未结算数据的补充 4 years ago
郑永星 6699ce1045 Merge pull request '未结算数据的补充' (#23) from feature/add_item into release 
未结算数据的补充
 4 years ago
zhengyongxing f13ee0583c 未结算数据的补充 4 years ago
chenzhi d08691c13a 优化充值列表导出 4 years ago
chenzhi 29636f2922 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/more_finance_20201211 4 years ago
廖金灵 ace44195c5 Merge pull request 'hotfix/and_bug' (#22) from hotfix/and_bug into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/22
 4 years ago
chenzhi 78451f0551 消除打印信息 4 years ago
chenzhi 96ead18ff6 优化打印 4 years ago
chenzhi 7abcd38f36 解决推广公司bug 4 years ago
廖金灵 3bedf259a0 Merge pull request 'feature/1211' (#21) from feature/1211 into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/21
 4 years ago
陈志 7286e3d157 Merge pull request 'hotfix/and_bug' (#20) from hotfix/and_bug into release 
优化下游推广公司搜索
 4 years ago
chenzhi fb798e82bf 优化下游推广公司搜索 4 years ago
tping e4ef55531a 特殊公司评级管理权限 4 years ago
tping e495105ed0 会长可以看 4 years ago
chenzhi fe75b57618 合并master 4 years ago
廖金灵 72135079fa Merge pull request '数据授权js错误修正' (#16) from feature/add_item into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/16
 4 years ago
zhengyongxing a31e3bf1ab 数据授权js错误修正 4 years ago
chenzhi 0d533525fe 优化权限修改 4 years ago
tping 15c841e883 Merge branch 'release' into feature/1211 4 years ago
tping 553ce102df 特殊公司 4 years ago
郑永星 1f75da3603 Merge pull request '手机万能验证码隐藏' (#13) from feature/add_item into release 
手机万能验证码隐藏
 4 years ago
zhengyongxing 9736a32013 手机万能验证码隐藏 4 years ago
郑永星 bc162ada96 Merge pull request '手机验证码修改账号' (#12) from feature/add_item into release 
手机验证码修改账号
 4 years ago
zhengyongxing d47b6a3fad 手机验证码修改账号 4 years ago
廖金灵 342b592976 Merge pull request 'feature/testing_resource_verify_admin' (#11) from feature/testing_resource_verify_admin into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/11
 4 years ago
郑永星 48bf17afd3 Merge pull request 'feature/add_item' (#10) from feature/add_item into release 
短信登录万能验证码登录开启
 4 years ago
zhengyongxing 0d9dd3b22e 短信登录万能验证码登录开启 4 years ago
zhengyongxing 11e64947df 12月功能提交 4 years ago
郑永星 ca8a2ada0e Merge pull request '12月功能提交,手机万能验证码屏蔽提交' (#7) from feature/add_item into release 
12月功能提交,手机万能验证码屏蔽提交
 4 years ago
zhengyongxing 309b195986 12月功能提交 4 years ago
陈志 79ad02ba2e Merge pull request '优化' (#9) from feature/st_mange_20201202 into release 
优化
 4 years ago
chenzhi 1945cae9a5 优化 4 years ago
chenzhi 28e93fe832 新增文件 4 years ago
张谷成 6e63a3857e Merge pull request 'feature/1211' (#8) from feature/1211 into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/8
 4 years ago
tping 0fd16f89d8 Merge branch 'release' into feature/1211 4 years ago
zhengyongxing a0150c300f 12月功能提交 4 years ago
tping cf88d4c1db Merge branch 'release' into feature/1211 
# Conflicts:
#	Application/Home/Controller/BaseController.class.php
 4 years ago