Commit Graph

340 Commits (926b8975f1db5846f47effd15c7b1c16b4a62e1b)

Author SHA1 Message Date
廖金灵 ea21c1ee49 Merge pull request '修改i哎' () from feature/add_promote_level_id into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/133
ELF 874ba3a705 修改i哎
廖金灵 9af9edef0a Merge pull request '优化' () from feature/add_promote_level_id into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/129
ELF a3d3b5722c 优化
郑永星 3d09dcf4b5 Merge pull request '1.28功能提交' () from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/127
zhengyongxing 338c0369d1 1.28功能提交
廖金灵 dcbc152712 Merge pull request '优化' () from feature/add_promote_level_id into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/125
ELF 4f3c21263d 优化
廖金灵 7194d5a945 Merge pull request '优化' () from feature/add_promote_level_id into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/112
ELF 0aa3c514d7 优化
陈志 0b55550a62 Merge pull request 'feature/testing_daily_count' () from feature/testing_daily_count into release
优化首页提醒
chenzhi 13d0c6fa59 优化首页提醒
ELF 9e68e40200 解决冲突
chenzhi 2658c50c3a 新增测试资源统计
ELF 531b94bae8 版本
elf@home 34e25f293a 推广员添加每级id
郑永星 6c1c82b649 Merge pull request '1.28功能提交' () from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/100
zhengyongxing deff984922 1.28功能提交
ELF d08df7feba 修改
ELF 07c95d2ea7 剑破长空测试资源
zhengyongxing c9ef39ada9 市场业绩离职功能提交导出修正
zhengyongxing d3e9f113ba 市场业绩离职功能提交导出修正
zhengyongxing 6e767a739c 市场业绩功能提交
ELF 3dfc92ecc3 修改下载超时
ELF a70bffaee3 修改bug
ELF 4f4929ad72 修改
ELF 932a082134 剑仙诀添加资源发放接口
廖金灵 342b592976 Merge pull request 'feature/testing_resource_verify_admin' () from feature/testing_resource_verify_admin into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/11
tping cf88d4c1db Merge branch 'release' into feature/1211
# Conflicts:
#	Application/Home/Controller/BaseController.class.php
ELF f2be33c427 修改
tping 31ce7b071c 1211
ELF 1b74318619 修改
ELF c8f082cee8 优化显示
ELF 78caa452b2 测试资源添加审核人
ELF 88402dfac0 修改
ELF 1bb1b284e6 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/promote_order_settle_check
ELF f95125892a 优化推广员后台汇总查询
ELF 7468057834 推广员结算订单归属
ELF a0f57749c4 优化当前域名获取
ELF c339623c78 优化
elf@home dd66846e68 根据推广公司配置推广后台
ELF 89332c0d54 解决冲突
ELF c550846454 修改
ELF 977cfcba3c 修改
ELF c20d071817 修改
ELF 40123f8c50 修改
ELF 530dded4e7 优化
ELF ceadb8562f 新增60/90日留存率统计
ELF 5253a76963 优化
ELF 3a6b912399 优化