Commit Graph

6859 Commits (5253a76963389c9943a5b4026a2eca1370b96c2b)
 

Author SHA1 Message Date
廖金灵 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,推广后台增加下单时间查询
郑永星 09a97a171c Merge branch 'feature/add_item_other' of wmtx/platform into release
市场业绩提交
zhengyongxing 0f44573fe2 市场业绩提交
郑永星 d23d97baa1 Merge branch 'feature/add_item_other' of wmtx/platform into release
2020.10.30财务功能预发布上线
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 比例功能提交
zhengyongxing 823e241f2e 外团推广功能bug修正