Commit Graph

232 Commits (44ceb3ead3555bb9691290a3089af3c4c4d4de7d)

Author SHA1 Message Date
ELF bfa0c5c5b8 迁移优化
ELF d7d78e748d 修改跨区bug
ELF 7bb9aa833c 优化
ELF 8dee426c5f 优化
ELF 8a815af691 优化
ELF a355c2b579 优化
elf@home 23643d2e0b 修改
ELF 874ba3a705 修改i哎
ELF 0aa3c514d7 优化
ELF 531b94bae8 版本
elf@home 34e25f293a 推广员添加每级id
廖金灵 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
tping 31ce7b071c 1211
ELF 1b74318619 修改
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 c339623c78 优化
elf@home dd66846e68 根据推广公司配置推广后台
ELF c550846454 修改
ELF 40123f8c50 修改
ELF 530dded4e7 优化
ELF afc95791d2 优化
ELF 1f3eaa06da 修改
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 c5fe80639f 修改
ELF 06bd640c79 修改
ELF 263e35c097 初步提交
ELF 2ae89b9edb 解决冲突
ELF 9b11202deb 修改
elf@home c4eb04428e 修改
ELF afad195062 修改
ELF ca99068a0e 修改
ELF 268ea4e34d 修改
ELF 6fcaa1362c 重置权限缓存
ELF 6da122550c 优化
ELF 16122d5d9f 修改
chenzhi f169d65c1c 优化推广公司添加排序
ELF 050eb98843 xiugai
ELF 2c9092273f 修改