elf
/
cf-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,369 Commits
1 Branch
0 Tags
154 MiB
master
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'e130228c39'
${ noResults }
Commit Graph

443 Commits (e130228c3959039a2586a9a57cbf8666df5e84e7)

Author SHA1 Message Date
ELF 6e2fda1e26 解决冲突 4 years ago
ELF 32bc839dcd 合并 4 years ago
zhengyongxing 24e33ed8ba Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage 
 Conflicts:
	Data/update.sql
 4 years ago
elf@home 50755b89c5 修改 4 years ago
ELF 2a52df9ebb 测试资源权限 4 years ago
zhengyongxing 250d2ac2c0 市场业绩毛利修改 4 years ago
ELF 06c4d5f1f1 优化测试资源 4 years ago
ELF 367345ea8d 修改 4 years ago
elf@home 461f347b1a 修改 4 years ago
ELF ecf460e7c9 修改 4 years ago
ELF 9c59ba06e2 修改 4 years ago
ELF 3383b3d2d9 修改 4 years ago
zhengyongxing d5e7546c51 市场结算管理市场业绩公式修正 4 years ago
ELF 49751b8760 测试资源修改 4 years ago
chenzhi 0f284cf9b3 优化游戏绑定，已经绑定不出现 4 years ago
ELF edb090feca 解决冲突 4 years ago
ELF 004b540a63 解决冲突 4 years ago
ELF 0803b686c3 解决冲突 4 years ago
ELF 49ea782f7c 解决冲突 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
zhengyongxing 11ff884e6a Merge branch 'feature/cp_juhe_company' into hotfix/market_percentage 
# Conflicts:
#	Application/Admin/Common/extend.php
#	Application/Admin/Controller/AggregateFinanceSetController.class.php
#	Application/Admin/Controller/CpJuheCompanyController.class.php
#	Application/Admin/View/CpJuheCompany/detail.html
#	Application/Admin/View/CpJuheCompany/export.html
#	Data/update.sql
 4 years ago
zhengyongxing 91178308f9 下游公司字段与上游公司字段一致 4 years ago
ELF 56282658fc 解决冲突 4 years ago
chenzhi 2a303cf0f5 优化审核流程 4 years ago
chenzhi 4460f8e7cf 新增结算包名 4 years ago
zhengyongxing 1ff82cce20 聚合下游公司列表添加 4 years ago
yulingwei 1bd33daa54 upt 4 years ago
chenzhi 2619e598e8 合并marster 4 years ago
ELF 096e32d581 商户配置 4 years ago
yulingwei 2fbea72d26 up 4 years ago
chenzhi d662c89b7e zancun 4 years ago
zhengyongxing 960903a31c 新功能添加 4 years ago
chenzhi d9d55a3bcb 优化新增下游公司 4 years ago
chenzhi 69adcbabf8 优化推广公司 4 years ago
chenzhi 5aa7427504 新增公司信息编辑 4 years ago
chenzhi f7d90780aa 新增CP公司审核 4 years ago
chenzhi 33cf2cf8a6 新增审核列表 4 years ago
yulingwei 33049f5a9f upt 4 years ago
chenzhi 0c2e2db65d 新增税费费率 4 years ago
yulingwei e155c92ed6 1 4 years ago
chenzhi 913793ac2c 优化打款 4 years ago
chenzhi 52b1168930 优化打款记录 4 years ago
chenzhi e9c3355c90 优化打款名称 4 years ago
chenzhi df878183ee 新增打款表 4 years ago
chenzhi 0c91774854 解决冲突 4 years ago
chenzhi 24f2b76bd6 新增导入 4 years ago
chenzhi 8d32b5104e 新增excel打款 4 years ago
chenzhi c9d6b9859d 合并热更 4 years ago
zhengyongxing 80dc2b860c Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/market_percentage 
 Conflicts:
	Application/Admin/Common/extend.php
	Application/Admin/Controller/TimingController.class.php
	Data/update.sql
 4 years ago
chenzhi 5fc03a14a4 优化cp添加 4 years ago