elf
/
cf-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,638 Commits
1 Branch
0 Tags
154 MiB
Commit Graph

456 Commits (ff46e189cc01669eddf5f114e6e282caed600768)

Author SHA1 Message Date
zyx f028794473 Merge branches 'feature/add_item' and 'master' of 47.111.118.107:wmtx/platform into feature/add_item 
 Conflicts:
	Data/update.sql
zhengyongxing ef0c4427ce Merge branches 'feature/add_item' and 'master' of 47.111.118.107:wmtx/platform into feature/add_item 
 Conflicts:
	Data/update.sql
zhengyongxing b4bdcd24fc 汇总bug流程修正
ELF 2ae89b9edb 解决冲突
ELF afad195062 修改
ELF 19c782b053 解决冲突
zhengyongxing f757c10c61 绑定公司修正
zhengyongxing 1e67b1d1a1 汇总bug修正
zhengyongxing a1ac92dc02 押金bug修正
ELF 268ea4e34d 修改
zhengyongxing a19f668687 财务汇总功能撤回审批修改
zhengyongxing fedcbd605b bug修改
ELF 16122d5d9f 修改
ELF 6e2fda1e26 解决冲突
ELF 32bc839dcd 合并
zhengyongxing 24e33ed8ba Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage 
 Conflicts:
	Data/update.sql
elf@home 50755b89c5 修改
ELF 2a52df9ebb 测试资源权限
zhengyongxing 250d2ac2c0 市场业绩毛利修改
ELF 06c4d5f1f1 优化测试资源
ELF 367345ea8d 修改
elf@home 461f347b1a 修改
ELF ecf460e7c9 修改
ELF 9c59ba06e2 修改
ELF 3383b3d2d9 修改
zhengyongxing d5e7546c51 市场结算管理市场业绩公式修正
ELF 49751b8760 测试资源修改
chenzhi 0f284cf9b3 优化游戏绑定，已经绑定不出现
ELF edb090feca 解决冲突
ELF 004b540a63 解决冲突
ELF 0803b686c3 解决冲突
ELF 49ea782f7c 解决冲突
zhengyongxing 4f681f7d72 Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage 
 Conflicts:
	Data/update.sql
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
zhengyongxing 91178308f9 下游公司字段与上游公司字段一致
ELF 56282658fc 解决冲突
chenzhi 2a303cf0f5 优化审核流程
chenzhi 4460f8e7cf 新增结算包名
zhengyongxing 1ff82cce20 聚合下游公司列表添加
yulingwei 1bd33daa54 upt
chenzhi 2619e598e8 合并marster
ELF 096e32d581 商户配置
yulingwei 2fbea72d26 up
chenzhi d662c89b7e zancun
zhengyongxing 960903a31c 新功能添加
chenzhi d9d55a3bcb 优化新增下游公司
chenzhi 69adcbabf8 优化推广公司
chenzhi 5aa7427504 新增公司信息编辑
chenzhi f7d90780aa 新增CP公司审核
chenzhi 33cf2cf8a6 新增审核列表