Commit Graph

429 Commits (406d1c47d4d8d76bcf4ab38886007f445339d84e)

Author SHA1 Message Date
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 新增审核列表
yulingwei 33049f5a9f upt
chenzhi 0c2e2db65d 新增税费费率
yulingwei e155c92ed6 1
chenzhi 913793ac2c 优化打款
chenzhi 52b1168930 优化打款记录
chenzhi e9c3355c90 优化打款名称
chenzhi df878183ee 新增打款表
chenzhi 0c91774854 解决冲突
chenzhi 24f2b76bd6 新增导入
chenzhi 8d32b5104e 新增excel打款
chenzhi c9d6b9859d 合并热更
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
chenzhi 5fc03a14a4 优化cp添加
chenzhi 03f4130e9e 新增上游合作
chenzhi d52ab03714 新增推广公司游戏选择
zhengyongxing 3128c079d3 推广员充值换榜定时器优化
ELF 990a2bd206 解决冲突
zhengyongxing 682ce333b1 市场结算管理公司税率提交
chenzhi c76cf038cd 己方公司
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
zhengyongxing a8f4f16349 Merge branch 'feature/juhe_sms' into feature/platfrom_aggregate_finance
# Conflicts:
#	Application/Admin/View/PromoteCompany/view.html
#	Data/update.sql
zhengyongxing cd0d9e295f 市场专员结算代码上传
zhengyongxing 379716298a 市场专员结算代码上传
ELF 11caa30cfa 修改
yulingwei 8c18f2aa1d 1
ELF 2d872ed710 解决冲突
yulingwei 0decb03cb1 merge