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

2957 Commits (1f7689fc6b992678669fb6f5fbe78e0c10ab5730)

Author SHA1 Message Date
zhengyongxing 6efa26ecfd 外团特殊比例自动审核通过
chenzhi 3db0914108 优化导出公司
chenzhi 833619518b 优化测试
chenzhi 9002ae24be 优化重算
陈志 24bbce9d66 Merge branch 'feature/add_item' of wmtx/platform into release 
优化上游
chenzhi d029e4562d 优化上游
陈志 e12add2432 Merge branch 'feature/add_item' of wmtx/platform into release 
优化上游pool
chenzhi 6f90b18be9 优化上游pool
郑永星 2496f1f64b Merge branch 'feature/add_item_other' of wmtx/platform into release 
内团推广游戏提示语修改
zhengyongxing 178f89f43b 内团推广游戏提示语修改
郑永星 a9f96722b1 Merge branch 'feature/add_item_other' of wmtx/platform into release 
外团推广功能提交
zhengyongxing 25e710c27e 外团推广功能提交
张谷诚 b642f671c7 Merge branch 'hotfix/orderquery' of wmtx/platform into release
tping e6ae117fd7 1,隐藏删除按钮（后台->推广->游戏分包） 
2,推广后台增加下单时间查询
zhengyongxing 0f44573fe2 市场业绩提交
zhengyongxing bb5547fb6f Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/add_item_other 
 Conflicts:
	Data/update.sql
zhengyongxing ce3aa147e5 Merge remote-tracking branch 'origin/feature/add_item' into feature/add_item
zhengyongxing ccf27d77a1 市场业绩删除修正
chenzhi 9083471980 优化补点
zhengyongxing 295f86e588 Merge remote-tracking branch 'origin/feature/add_item' into feature/add_item
zhengyongxing 7463222308 外团推广功能提交
chenzhi 3f6472e64c 优化下游个人补点
zhengyongxing e33b19d4b0 外团推广功能提交
zhengyongxing 4e8cb8dfe1 外团推广功能提交
zhengyongxing f569747948 外团推广功能提交
zhengyongxing f38b9026b5 外团推广功能提交
zhengyongxing f6f9437ed0 外团推广功能提交
zhengyongxing b0b893e51d Merge remote-tracking branch 'origin/feature/add_item' into feature/add_item
zhengyongxing 80b148d6c5 外团推广功能提交
chenzhi 6ce7377dc1 优化补点
zhengyongxing 859f5b58c9 汇总功能还原修正
zhengyongxing f450df3265 汇总功能修正
zhengyongxing 54a0fde480 汇总公司与上游回退
zhengyongxing 233fa89251 外团推广功能提交
zhengyongxing 38fb5398d1 外团推广功能提交
zhengyongxing 27c95792ff 外团推广功能提交
zhengyongxing def69bf6aa 外团推广功能修正提交
zhengyongxing 0af52ad4ea 汇总金额为空时添加数据
zhengyongxing 8340ddc115 外团推广功能提交
zhengyongxing a5c7c224aa 比例功能提交
zhengyongxing 34b12ad382 定时器功能提交
zhengyongxing 5c497b94dc 分成比例导出修正
zhengyongxing c1b556b0b1 市场业绩排序修改
chenzhi 10d13472ec 紧急修复外团选择游戏
zhengyongxing 6ac5c1d524 比例逻辑修改
zhengyongxing 40664b5f8d 市场业绩功能修改，将不结算毛利以日来统计
zhengyongxing ba6323203a 模板比例bug修改提交
zhengyongxing 2914f9964c 汇总编辑结算金额总计添加
zhengyongxing aa852a9a7f 外团推广功能金额修改
zhengyongxing f0cbe3cafb 周结算金额bug修改
zhengyongxing 86769746ef 外团可申请游戏bug修改
zhengyongxing 5c57abc794 历史流水比例修正
zhengyongxing a00834e4e5 外团推广功能不结算提交
zhengyongxing 9c49d8bedc 外团推广功能提交
zhengyongxing 3855d8d3a9 市场业绩的功能提交
ELF ffad0d78c5 修改
ELF 62d2eaef72 去除商户规则配置删除功能
ELF 3a4fb51222 修改支付商户规则bug
ELF e25f30d13c 修改
ELF dc5e032817 修改
ELF fe55de4aaf 修改
zhengyongxing 32b139a976 比例时间排序
zhengyongxing 9bf3c89659 特殊比例与模板比例添加流水类型
ELF b44a5118cf 修改
万盟天下 f7bd731ead Merge branch 'feature/testing_resource_admin' of wmtx/platform into master 
测试资源功能提交
ELF 36c240c608 修改
zhengyongxing 68ba764d72 Merge branch 'hotfix/modify_special_piont' into feature/add_item
zhengyongxing d9b37792fd 特殊补点bug修正
zhengyongxing 4f35cacbab 汇总模板修改提交
ELF 36c4c666ec 修改bug
ELF c5fe80639f 修改
ELF 06bd640c79 修改
ELF 263e35c097 初步提交
廖金灵 662efdb613 Merge branch 'feature/add_item' of wmtx/platform into master 
聚合结算单导出bug修正
郑永星 8d37653db4 Merge branch 'feature/add_item' of wmtx/platform into release 
聚合结算单导出公式添加
zhengyongxing ff46e189cc 聚合结算单导出公式添加
郑永星 a8c008923e Merge branch 'feature/add_item' of wmtx/platform into release 
汇总导出bug修正
zhengyongxing 053e8acb8f 汇总导出bug修正
郑永星 6cbc8e0102 Merge branch 'feature/add_item' of wmtx/platform into release 
聚合汇总导出bug修改
zhengyongxing 1f31244d10 聚合汇总导出bug修改
郑永星 37dd11369e Merge branch 'feature/add_item' of wmtx/platform into release 
聚合结算单导出bug修正
zhengyongxing ac5c1a199c 聚合结算单导出bug修正
廖金灵 e916641647 Merge branch 'feature/add_item' of wmtx/platform into master 
聚合结算单导出个人与公司导出不相同
郑永星 ac14a6be90 Merge branch 'feature/add_item' of wmtx/platform into release 
聚合结算单导出个人与公司导出不相同
zyx 3db4fe1f60 聚合结算单导出个人与公司导出不相同
zyx b92ce713b3 聚合结算单上线
廖金灵 ef9a6d446b Merge branch 'feature/promote_level_sys' of wmtx/platform into master 
游戏统计bug
ELF 2b1980bfbd 修改
廖金灵 51e3863b82 Merge branch 'feature/add_item' of wmtx/platform into master 
导出公式添加
zhengyongxing f72bb66356 导出公式添加
廖金灵 a2a9625933 Merge branch 'feature/add_item' of wmtx/platform into master 
聚合公司汇总公司添加，公司绑定编辑开放
郑永星 cdcfc02614 Merge branch 'feature/add_item' of wmtx/platform into release 
公司绑定参数错误修正
zhengyongxing 0d13b05dc0 公司绑定参数错误修正
郑永星 38eb0f4957 Merge branch 'feature/add_item' of wmtx/platform into release 
汇总bug修正
zhengyongxing 71826be2cc 汇总bug修正
郑永星 0fd8c71af0 Merge branch 'feature/add_item' of wmtx/platform into release 
汇总bug修正
zhengyongxing ba74305974 汇总bug修正
郑永星 ed4297cb71 Merge branch 'feature/add_item' of wmtx/platform into release 
汇总bug修正
zhengyongxing c711ef4b92 汇总bug修正
郑永星 61d69eab60 Merge branch 'feature/add_item' of wmtx/platform into release
zhengyongxing f1308fce73 汇总bug修正
郑永星 b69bc8ef6a Merge branch 'feature/add_item' of wmtx/platform into release 
汇总bug修正
zhengyongxing 3f78880f7d 汇总bug修正
ELF 2ff1fc0041 修改
ELF 55466e44ee 修改
ELF dec6c4b222 修改权限
zyx a2d68a2752 汇总状态的操作修改
zyx 5bec0ba91c 汇总状态的操作修改
zyx 4a7915ef69 汇总状态的操作修改
zyx d42cd15b0b 汇总状态的操作修改
zyx 041006e1b4 汇总状态的操作修改
zyx 2c5889cd50 汇总状态的操作修改
zyx c692e51fa7 汇总状态的操作修改
zyx 52f4cbacb9 汇总状态的操作修改
zyx 178c86a751 撤销汇总添加退回审核状态
zhengyongxing 56593d5ee8 汇总bug修正
zhengyongxing dc5a65903b 汇总bug修正
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 4210bb7bf0 汇总bug修正
zhengyongxing b4bdcd24fc 汇总bug流程修正
zhengyongxing e153fb66ca 聚合重新汇总bug修正
万盟天下 9db2434d10 Merge branch 'feature/add_item' of wmtx/platform into master 
聚合公司绑定流程优化
zhengyongxing 2b4ed15a30 聚合公司绑定流程优化
郑永星 8b9c732f6a Merge branch 'feature/add_item' of wmtx/platform into master 
审核拒绝bug修正
zhengyongxing 7d3c8ebd61 审核拒绝bug修正
万盟天下 1cb13ebb4c Merge branch 'feature/add_item' of wmtx/platform into master 
聚合汇总bug修正
zhengyongxing a2b085562d 聚合汇总bug修正
郑永星 4f9c672aa1 Merge branch 'feature/add_item' of wmtx/platform into release 
聚合公司绑定修正
zhengyongxing a977cf5f31 聚合公司绑定修正
ELF 19c782b053 解决冲突
郑永星 2c8c246d31 Merge branch 'feature/add_item' of wmtx/platform into release 
汇总权限测试
zhengyongxing 6b486331b5 汇总权限测试
郑永星 66af352eb8 Merge branch 'feature/add_item' of wmtx/platform into release 
公司绑定修正
zhengyongxing f4f822d31a 公司绑定修正
郑永星 07e877af4b Merge branch 'feature/add_item' of wmtx/platform into release 
绑定公司修正
zhengyongxing f757c10c61 绑定公司修正
郑永星 a825f4757a Merge branch 'feature/add_item' of wmtx/platform into release 
小bug修改
zhengyongxing 0ebaf6ed64 小bug修改
郑永星 e593db626c Merge branch 'feature/add_item' of wmtx/platform into release 
押金bug修正
zhengyongxing 1e67b1d1a1 汇总bug修正
chenzhi 12e8500ce3 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/new_statement_0925
ELF 268ea4e34d 修改
zhengyongxing 465f095dc4 市场业绩bug修正
chenzhi 7a8b91c8f0 优化下游同游戏判断
zhengyongxing 7a021dced5 市场业绩提示语修正
zhengyongxing 15ad0a902b Merge branches 'feature/add_item' and 'release' of 47.111.118.107:wmtx/platform into feature/add_item 
 Conflicts:
	Data/update.sql
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
万盟天下 9209c4fe38 Merge branch 'hotfix/change_game_0927' of wmtx/platform into release 
优化删除游戏报错bug
ELF 24fe97186e 修改
chenzhi c40e366a03 优化删除游戏报错bug