Commit Graph

316 Commits (919875c69cc03744ba295d5bcd8f4993eced37d6)

Author SHA1 Message Date
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 优化
ELF afc95791d2 优化
ELF 1f3eaa06da 修改
ELF 07f7bca3ee 修改
ELF 47ca2f2b9e 修改
ELF e1352fea1e 修改
ELF dd71ccdf83 修改
ELF f490f10ee5 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/testing_resource_admin
ELF 34586b228e 修改
ELF 8c8d01a446 修改评级
ELF 3a4fb51222 修改支付商户规则bug
ELF 65c5a221fc 修改
ELF b44a5118cf 修改
ELF 36c240c608 修改
ELF a10bb888da 修改bug
ELF c5fe80639f 修改
ELF 06bd640c79 修改
ELF 263e35c097 初步提交
ELF 2ae89b9edb 解决冲突
ELF 9b11202deb 修改
elf@home c4eb04428e 修改
ELF afad195062 修改
ELF ca99068a0e 修改
ELF 19c782b053 解决冲突
ELF 268ea4e34d 修改