Commit Graph

5968 Commits (ed8d1fee0ad87803f7bf547d7e57a8cd425cf7be)

Author SHA1 Message Date
ELF b92f564a49 发放资源自动审核/发放优化
ELF c550846454 修改
zhengyongxing 4526b5b741 11月功能提交
ELF 977cfcba3c 修改
ELF c20d071817 修改
ELF 40123f8c50 修改
ELF 530dded4e7 优化
ELF ceadb8562f 新增60/90日留存率统计
ELF 5253a76963 优化
ELF 3a6b912399 优化
ELF afc95791d2 优化
chenzhi d0a61d3e87 游戏充值导出新增cp列
ELF d0b2e5f459 优化
ELF 1f3eaa06da 修改
ELF 07f7bca3ee 修改
ELF 47ca2f2b9e 修改
ELF e1352fea1e 修改
chenzhi cdd1cd7d7f 优化页面页数
ELF dd71ccdf83 修改
廖金灵 648cde1eff Merge branch 'hotfix/perm_market_visiable' of wmtx/platform into release
推广员信息显示通过权限控制
ELF 53f3ad6864 优化
廖金灵 38dc6c0c56 Merge branch 'hotfix/perm_market_visiable' of wmtx/platform into release
市场专员信息显示通过权限控制
ELF dfdc31f4dc 市场专员信息显示通过权限控制
zhengyongxing 6021f91604 公会订单添加所属商户
zhengyongxing 3f04fa1507 公会统计商户名称修改
zhengyongxing deee3228dd 公会统计商户导出
zhengyongxing 58ff5ad1ed 公会统计--订单详情 新增所属商户展示
ELF f490f10ee5 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/testing_resource_admin
zhengyongxing 767ce5734d 市场业绩重算只重算上个月提交
zhengyongxing a3b86e9339 市场业绩提成修正
zhengyongxing d85ac9066d 市场业绩bug修改
zhengyongxing 6c005f01f6 市场业绩比例永久判断bug修改
廖金灵 f7eb64f6ba Merge branch 'feature/add_item_other' of wmtx/platform into master
外团特殊比例自动审核通过
zhengyongxing 48f4fef494 外团特殊比例自动审核通过
zhengyongxing 02635cc6e9 外团特殊比例自动审核通过
zhengyongxing 324deba9c2 外团特殊比例功能提交
zhengyongxing 24f3cbc99e 外团特殊比例功能提交
zhengyongxing cf21a4f324 外团特殊比例自动审核通过
zhengyongxing 6efa26ecfd 外团特殊比例自动审核通过
廖金灵 3099b175c8 Merge branch 'hotfix/orderquery' of wmtx/platform into master
增加清除时间
zhengyongxing d73602d30b Merge branch 'feature/add_item_other' of 47.111.118.107:wmtx/platform into feature/add_item_other
zhengyongxing 0155111706 特殊比例申请比例限制提交
chenzhi 3db0914108 优化导出公司
zhengyongxing b3658dfaa9 比例方法提交
tping 5a57d87ff7 增加清空时间
chenzhi 833619518b 优化测试
chenzhi 9002ae24be 优化重算
陈志 24bbce9d66 Merge branch 'feature/add_item' of wmtx/platform into release
优化上游
chenzhi d029e4562d 优化上游
廖金灵 a3ce776d16 Merge branch 'feature/version_1028' of wmtx/platform into release
优化代码
陈志 e12add2432 Merge branch 'feature/add_item' of wmtx/platform into release
优化上游pool
chenzhi 6f90b18be9 优化上游pool
ELF 2dc69ac892 修改
廖金灵 710573f511 Merge branch 'feature/version_1028' of wmtx/platform into release
修改数据汇总bug
ELF 75754a8957 修改
张谷诚 fc666fa7b1 Merge branch 'hotfix/orderquery' of wmtx/platform into release
导出支付显示问题
tping 1c6a17d50f 支付方式显示
张谷诚 f25bc96071 Merge branch 'hotfix/orderquery' of wmtx/platform into release
到账时间导出
tping adb011ca5a 到账时间
郑永星 2496f1f64b Merge branch 'feature/add_item_other' of wmtx/platform into release
内团推广游戏提示语修改
zhengyongxing 178f89f43b 内团推广游戏提示语修改
张谷诚 0c9033e700 Merge branch 'hotfix/orderquery' of wmtx/platform into release
到账时间导出
tping e86f4c4762 到账时间
郑永星 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 外团推广功能提交
廖金灵 9c6f1b6789 Merge branch 'feature/version_1028' of wmtx/platform into release
修改bug
ELF be9075fc63 修改bug
chenzhi 6ce7377dc1 优化补点
zhengyongxing 859f5b58c9 汇总功能还原修正
zhengyongxing f450df3265 汇总功能修正
zhengyongxing 54a0fde480 汇总公司与上游回退
zhengyongxing 233fa89251 外团推广功能提交
zhengyongxing 38fb5398d1 外团推广功能提交
zhengyongxing 27c95792ff 外团推广功能提交
zhengyongxing def69bf6aa 外团推广功能修正提交
zhengyongxing 0af52ad4ea 汇总金额为空时添加数据
zhengyongxing befa97e04d Merge branch 'feature/add_item' of 47.111.118.107:wmtx/platform into feature/add_item
chenzhi 96b296a4b6 优化比例为空
zhengyongxing 8340ddc115 外团推广功能提交
zhengyongxing c27315d3c0 外团推广功能提交
chenzhi ded1da96f9 Merge branch 'feature/add_item' of 47.111.118.107:wmtx/platform into feature/add_item
chenzhi 7ade60fb02 优化比例获取
zhengyongxing a5c7c224aa 比例功能提交