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

403 Commits (09629a12a8ef1efb4132c9c77eeed737d932b5eb)

Author SHA1 Message Date
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
 5 years ago
zhengyongxing 91178308f9 下游公司字段与上游公司字段一致 5 years ago
zhengyongxing 1ff82cce20 聚合下游公司列表添加 5 years ago
zhengyongxing 960903a31c 新功能添加 5 years ago
chenzhi 913793ac2c 优化打款 5 years ago
chenzhi 52b1168930 优化打款记录 5 years ago
chenzhi e9c3355c90 优化打款名称 5 years ago
chenzhi df878183ee 新增打款表 5 years ago
chenzhi 0c91774854 解决冲突 5 years ago
chenzhi 24f2b76bd6 新增导入 5 years ago
chenzhi 8d32b5104e 新增excel打款 5 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
 5 years ago
zhengyongxing 3128c079d3 推广员充值换榜定时器优化 5 years ago
ELF 990a2bd206 解决冲突 5 years ago
zhengyongxing 682ce333b1 市场结算管理公司税率提交 5 years ago
chenzhi c76cf038cd 己方公司 5 years ago
zhengyongxing f63b115641 Merge remote-tracking branch 'origin/feature/platfrom_aggregate_finance' into feature/platfrom_aggregate_finance 
# Conflicts:
#	Application/Admin/View/PromoteCompany/add.html
#	Application/Admin/View/PromoteCompany/edit.html
 5 years ago
zhengyongxing a8f4f16349 Merge branch 'feature/juhe_sms' into feature/platfrom_aggregate_finance 
# Conflicts:
#	Application/Admin/View/PromoteCompany/view.html
#	Data/update.sql
 5 years ago
zhengyongxing cd0d9e295f 市场专员结算代码上传 5 years ago
zhengyongxing 379716298a 市场专员结算代码上传 5 years ago
ELF 11caa30cfa 修改 5 years ago
yulingwei 8c18f2aa1d 1 5 years ago
ELF 2d872ed710 解决冲突 5 years ago
yulingwei 0decb03cb1 merge 5 years ago
zhengyongxing 25ae6a03a4 Merge remote-tracking branch 'origin/feature/platfrom_aggregate_finance' into feature/platfrom_aggregate_finance 5 years ago
zhengyongxing b664ba46ad 汇总单代码提交 5 years ago
zhengyongxing 9d43914b17 汇总单结算代码上传 5 years ago
chenzhi af1829c124 新增打款详情 5 years ago
chenzhi f20e4659a0 优化表格 5 years ago
chenzhi 3611e4855d 合并冲突 5 years ago
chenzhi a2fdc7c467 新增打款确认 5 years ago
chenzhi 1f155020d4 新增是否允许打款 5 years ago
ELF 4419030b1a 添加推广限制sql 5 years ago
chenzhi 79a9a8c68c 新增重算 5 years ago
chenzhi 3b8d6eb128 新增导出 5 years ago
yulingwei af5b215f8b upt 5 years ago
chenzhi 0f632f386b 下游个人聚合 5 years ago
yulingwei f969802c26 upt 5 years ago
chenzhi f2ce52ada5 暂存 5 years ago
zhengyongxing 4ff957d0f1 将官方渠道修改为江息网络 5 years ago
chenzhi 427d6457fc 上游查看及导出 5 years ago
chenzhi 22aa5d3dd4 暂存 5 years ago
chenzhi 02e7d85e44 优化生成结算单 5 years ago
chenzhi a9e0b303dd 推广公司新增支付宝账号 5 years ago
chenzhi f7d67ff4c4 新增合作方阿里账号及用户 5 years ago
chenzhi cd0ff2ef8a 暂存 5 years ago
zhengyongxing 1e4a1aef4e 苹果beta包添加第三方支付名单 5 years ago
chenzhi 466f1f4680 汇总提交ok 5 years ago
chenzhi caf432f5d4 新增高亮 5 years ago
chenzhi 8bfe249251 新增备注 5 years ago