243 Commits (a6f3dd8b29446f2832ecaba5aca0134227f80254)

Author SHA1 Message Date
廖金灵 a1ba918e60 Merge pull request '优化' (#601) from feature/upgrade_pack into master_out_qy
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/601
3 years ago
elf 6e87d5c700 优化 3 years ago
廖金灵 108bebb213 Merge pull request '优化' (#600) from feature/upgrade_pack into master_out_qy
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/600
3 years ago
elf 2f60cd3c31 优化 3 years ago
廖金灵 2c0225b59a Merge pull request '优化' (#598) from feature/upgrade_pack into master_out_qy
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/598
3 years ago
elf c3202ca2c1 优化 3 years ago
elf b0ef81e0f5 有害 3 years ago
elf 44157634d3 旗云测试资源 3 years ago
ELF 154fa521da Merge branch 'master' of 8.136.139.249:wmtx/platform into master_out 4 years ago
ELF 3529e2b819 Merge branch 'hotfix/game_static_fix' into master_out 4 years ago
ELF 0af353e2da 优化 4 years ago
ELF d7d78e748d 修改跨区bug 4 years ago
ELF 560fc4e4ba 优化 4 years ago
ELF 7bb9aa833c 优化 4 years ago
ELF 8dee426c5f 优化 4 years ago
ELF 8a815af691 优化 4 years ago
ELF a355c2b579 优化 4 years ago
elf@home 23643d2e0b 修改 4 years ago
ELF 874ba3a705 修改i哎 4 years ago
ELF 0aa3c514d7 优化 4 years ago
ELF 531b94bae8 版本 4 years ago
elf@home 34e25f293a 推广员添加每级id 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
tping cf88d4c1db Merge branch 'release' into feature/1211
# Conflicts:
#	Application/Home/Controller/BaseController.class.php
4 years ago
tping 31ce7b071c 1211 4 years ago
ELF 1b74318619 修改 4 years ago
ELF 88402dfac0 修改 4 years ago
ELF 1bb1b284e6 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/promote_order_settle_check 4 years ago
ELF f95125892a 优化推广员后台汇总查询 4 years ago
ELF 7468057834 推广员结算订单归属 4 years ago
ELF c339623c78 优化 4 years ago
elf@home dd66846e68 根据推广公司配置推广后台 4 years ago
ELF c550846454 修改 4 years ago
ELF 40123f8c50 修改 4 years ago
ELF 530dded4e7 优化 4 years ago
ELF afc95791d2 优化 4 years ago
ELF 1f3eaa06da 修改 4 years ago
ELF e1352fea1e 修改 4 years ago
ELF dd71ccdf83 修改 4 years ago
ELF f490f10ee5 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/testing_resource_admin 4 years ago
ELF 34586b228e 修改 4 years ago
ELF 8c8d01a446 修改评级 4 years ago
ELF 3a4fb51222 修改支付商户规则bug 4 years ago
ELF 65c5a221fc 修改 4 years ago
ELF b44a5118cf 修改 4 years ago
ELF 36c240c608 修改 4 years ago
ELF c5fe80639f 修改 4 years ago
ELF 06bd640c79 修改 4 years ago
ELF 263e35c097 初步提交 4 years ago
ELF 2ae89b9edb 解决冲突 4 years ago