 ELF
|
a70bffaee3
|
修改bug
|
4 years ago |
|
ELF
|
4f4929ad72
|
修改
|
4 years ago |
|
ELF
|
932a082134
|
剑仙诀添加资源发放接口
|
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 |
|
ELF
|
f2be33c427
|
修改
|
4 years ago |
|
tping
|
31ce7b071c
|
1211
|
4 years ago |
|
ELF
|
1b74318619
|
修改
|
4 years ago |
|
ELF
|
c8f082cee8
|
优化显示
|
4 years ago |
|
ELF
|
78caa452b2
|
测试资源添加审核人
|
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
|
a0f57749c4
|
优化当前域名获取
|
4 years ago |
|
ELF
|
c339623c78
|
优化
|
4 years ago |
|
elf@home
|
dd66846e68
|
根据推广公司配置推广后台
|
4 years ago |
|
ELF
|
89332c0d54
|
解决冲突
|
4 years ago |
|
ELF
|
c550846454
|
修改
|
4 years ago |
|
ELF
|
977cfcba3c
|
修改
|
4 years ago |
|
ELF
|
c20d071817
|
修改
|
4 years ago |
|
ELF
|
40123f8c50
|
修改
|
4 years ago |
|
ELF
|
530dded4e7
|
优化
|
4 years ago |
|
ELF
|
ceadb8562f
|
新增60/90日留存率统计
|
4 years ago |
|
ELF
|
5253a76963
|
优化
|
4 years ago |
|
ELF
|
3a6b912399
|
优化
|
4 years ago |
|
ELF
|
afc95791d2
|
优化
|
4 years ago |
|
ELF
|
1f3eaa06da
|
修改
|
4 years ago |
|
ELF
|
07f7bca3ee
|
修改
|
4 years ago |
|
ELF
|
47ca2f2b9e
|
修改
|
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
|
a10bb888da
|
修改bug
|
4 years ago |
|
ELF
|
c5fe80639f
|
修改
|
4 years ago |
|
ELF
|
06bd640c79
|
修改
|
4 years ago |
|
ELF
|
263e35c097
|
初步提交
|
4 years ago |
|
ELF
|
2ae89b9edb
|
解决冲突
|
4 years ago |
|
ELF
|
9b11202deb
|
修改
|
4 years ago |
|
elf@home
|
c4eb04428e
|
修改
|
4 years ago |
|
ELF
|
afad195062
|
修改
|
4 years ago |
|
ELF
|
ca99068a0e
|
修改
|
4 years ago |
|
ELF
|
19c782b053
|
解决冲突
|
4 years ago |
|
ELF
|
268ea4e34d
|
修改
|
4 years ago |
zhengyongxing
|
dab8251c11
|
Merge branches 'feature/company_export_change' and 'release' of 47.111.118.107:wmtx/platform into feature/company_export_change
Conflicts:
Application/Admin/Controller/AggregateFinanceStatementController.class.php
Data/update.sql
|
4 years ago |
|
ELF
|
6fcaa1362c
|
重置权限缓存
|
4 years ago |
|
ELF
|
6da122550c
|
优化
|
4 years ago |
|
zhengyongxing
|
f95b593455
|
Merge remote-tracking branch 'origin/feature/company_export_change' into feature/company_export_change
# Conflicts:
# Application/Base/Tool/AggregateClient.class.php
# Data/update.sql
|
4 years ago |
|
zhengyongxing
|
3c698adba9
|
上游导出修正
|
4 years ago |
|
ELF
|
16122d5d9f
|
修改
|
4 years ago |
chenzhi
|
f169d65c1c
|
优化推广公司添加排序
|
4 years ago |
|
ELF
|
050eb98843
|
xiugai
|
4 years ago |
|
ELF
|
2c9092273f
|
修改
|
4 years ago |
|
elf@home
|
1dd594f46f
|
修改bug
|
4 years ago |
|
廖金灵
|
6a78824b10
|
Merge branch 'feature/promote_company_merge' of wmtx/platform into release
修改
|
4 years ago |
|
ELF
|
268e084241
|
修改
|
4 years ago |
|
廖金灵
|
931c837d7e
|
Merge branch 'feature/promote_company_merge' of wmtx/platform into release
优化
|
4 years ago |
|
ELF
|
9d67a4c842
|
优化
|
4 years ago |
|
廖金灵
|
c9b1326c42
|
Merge branch 'feature/promote_company_merge' of wmtx/platform into release
修改
|
4 years ago |
|
ELF
|
6596e01a29
|
修改
|
4 years ago |
|
zhengyongxing
|
65532fc0ab
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/company_export_change_other
Conflicts:
Application/Admin/Controller/PromoteCompanyController.class.php
Application/Base/Tool/AggregateClient.class.php
|
4 years ago |
|
ELF
|
6e2fda1e26
|
解决冲突
|
4 years ago |
|
ELF
|
32bc839dcd
|
合并
|
4 years ago |
|
ELF
|
e0bbec0978
|
修改
|
4 years ago |
|
ELF
|
7614d5feca
|
修改
|
4 years ago |
|
ELF
|
e441f030c0
|
优化
|
4 years ago |
|
ELF
|
e9038d7471
|
ss
|
4 years ago |
|
ELF
|
296e378501
|
修改
|
4 years ago |
|
ELF
|
e4854aca3a
|
修改
|
4 years ago |
|
ELF
|
1a14ed8dc7
|
修改
|
4 years ago |
|
ELF
|
7adabb54f9
|
修改
|
4 years ago |
|
elf@home
|
50755b89c5
|
修改
|
4 years ago |
|
ELF
|
cc6c5d4e74
|
修改
|
4 years ago |
|
ELF
|
2867a05bb3
|
修改
|
4 years ago |
|
ELF
|
c7390f4c2e
|
bug修复
|
4 years ago |
|
ELF
|
e249596014
|
修改
|
4 years ago |
|
ELF
|
550da5cb37
|
测试
|
4 years ago |
|
ELF
|
06c4d5f1f1
|
优化测试资源
|
4 years ago |
|
zhengyongxing
|
b5e49e850d
|
上下游聚合打款信息修改
|
4 years ago |
|
ELF
|
fa90dc0bc8
|
修改
|
4 years ago |
|
ELF
|
c9cd377d4f
|
修改
|
4 years ago |
|
ELF
|
367345ea8d
|
修改
|
4 years ago |
|
ELF
|
ecf460e7c9
|
修改
|
4 years ago |
|
ELF
|
9c59ba06e2
|
修改
|
4 years ago |
|
zhengyongxing
|
62f4ce3362
|
上下游聚合打款信息修改
|
4 years ago |
|
ELF
|
3383b3d2d9
|
修改
|
4 years ago |
|
ELF
|
49751b8760
|
测试资源修改
|
4 years ago |
|
ELF
|
edb090feca
|
解决冲突
|
4 years ago |
|
ELF
|
004b540a63
|
解决冲突
|
4 years ago |
|
zhengyongxing
|
4f681f7d72
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
Conflicts:
Data/update.sql
|
4 years ago |
|
ELF
|
56282658fc
|
解决冲突
|
4 years ago |
|
ELF
|
0206a422f9
|
解决冲突
|
4 years ago |
|
ELF
|
62d7f15fdc
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/promote_landing_assign
|
4 years ago |
|
zhengyongxing
|
4c3112b70e
|
充值信息查看权限添加
|
4 years ago |